Skip to content

M
mariadb
Commit 50c95d2d authored by Dave Wells's avatar Dave Wells Committed by Yoni Fogel
Browse files
Options

fix memory leak in logcursor, rearrange code to share common code, improve... 

fix memory leak in logcursor, rearrange code to share common code, improve error messages refs #2446 [t:2446]

git-svn-id: file:///svn/toku/tokudb@18896 c7de825b-a66e-492c-adef-691d508d4ae1
parent 51506713
Show whitespace changes
Inline Side-by-side
Showing with 87 additions and 84 deletions
newbrt/logcursor.c
View file @ 50c95d2d
......@@ -221,6 +221,7 @@ fail:
int toku_logcursor_destroy(TOKULOGCURSOR *lc) {
int r=0;
if ( *lc ) {
if ( (*lc)->entry_valid ) {
toku_log_free_log_entry_resources(&((*lc)->entry));
(*lc)->entry_valid = FALSE;
......@@ -228,58 +229,95 @@ int toku_logcursor_destroy(TOKULOGCURSOR *lc) {
r = lc_close_cur_logfile(*lc);
int lf;
for(lf=0;lf<(*lc)->n_logfiles;lf++) {
toku_free((*lc)->logfiles[lf]);
if ( (*lc)->logfiles[lf] ) toku_free((*lc)->logfiles[lf]);
}
toku_free((*lc)->logfiles);
toku_free((*lc)->logdir);
if ((*lc)->buffer)
toku_free((*lc)->buffer);
if ( (*lc)->logfiles ) toku_free((*lc)->logfiles);
if ( (*lc)->logdir ) toku_free((*lc)->logdir);
if ( (*lc)->buffer ) toku_free((*lc)->buffer);
toku_free(*lc);
*lc = NULL;
}
return r;
}
int toku_logcursor_next(TOKULOGCURSOR lc, struct log_entry **le) {
int r=0;
if ( lc->entry_valid ) {
static int lc_log_read(TOKULOGCURSOR lc)
{
int r = toku_log_fread(lc->cur_fp, &(lc->entry));
while ( r == EOF ) {
// move to next file
r = lc_close_cur_logfile(lc);
if (r!=0) return r;
if ( lc->cur_logfiles_index == lc->n_logfiles-1) return DB_NOTFOUND;
lc->cur_logfiles_index++;
r = lc_open_logfile(lc, lc->cur_logfiles_index);
if (r!=0) return r;
r = toku_log_fread(lc->cur_fp, &(lc->entry));
}
if (r!=0) {
toku_log_free_log_entry_resources(&(lc->entry));
lc->entry_valid = FALSE;
if (lc->last_direction == LC_BACKWARD) {
struct log_entry junk;
r = toku_log_fread(lc->cur_fp, &junk);
assert(r == 0);
toku_log_free_log_entry_resources(&junk);
time_t tnow = time(NULL);
if (r==DB_BADFORMAT) {
fprintf(stderr, "%.24s Tokudb bad log format in %s\n", ctime(&tnow), lc->logfiles[lc->cur_logfiles_index]);
}
} else {
r = toku_logcursor_first(lc, le);
return r;
else {
fprintf(stderr, "%.24s Tokudb unexpected log format error '%s' in %s\n", ctime(&tnow), strerror(r), lc->logfiles[lc->cur_logfiles_index]);
}
r = toku_log_fread(lc->cur_fp, &(lc->entry));
while ( EOF == r ) {
// move to next file
}
return r;
}
static int lc_log_read_backward(TOKULOGCURSOR lc)
{
int r = toku_log_fread_backward(lc->cur_fp, &(lc->entry));
while ( -1 == r) { // if within header length of top of file
// move to previous file
r = lc_close_cur_logfile(lc);
if (r!=0)
return r;
if ( lc->cur_logfiles_index == lc->n_logfiles-1)
if ( lc->cur_logfiles_index == 0 )
return DB_NOTFOUND;
lc->cur_logfiles_index++;
lc->cur_logfiles_index--;
r = lc_open_logfile(lc, lc->cur_logfiles_index);
if (r!= 0)
if (r!=0)
return r;
r = toku_log_fread(lc->cur_fp, &(lc->entry));
// seek to end
r = fseek(lc->cur_fp, 0, SEEK_END);
assert(0==r);
r = toku_log_fread_backward(lc->cur_fp, &(lc->entry));
}
if (r!=0) {
toku_log_free_log_entry_resources(&(lc->entry));
time_t tnow = time(NULL);
if (r==DB_BADFORMAT) {
fprintf(stderr, "Bad log format in %s\n", lc->logfiles[lc->cur_logfiles_index]);
fprintf(stderr, "%.24s Tokudb bad log format in %s\n", ctime(&tnow), lc->logfiles[lc->cur_logfiles_index]);
}
else {
fprintf(stderr, "%.24s Tokudb uUnexpected log format error '%s' in %s\n", ctime(&tnow), strerror(r), lc->logfiles[lc->cur_logfiles_index]);
}
}
return r;
}
int toku_logcursor_next(TOKULOGCURSOR lc, struct log_entry **le) {
int r=0;
if ( lc->entry_valid ) {
toku_log_free_log_entry_resources(&(lc->entry));
lc->entry_valid = FALSE;
if (lc->last_direction == LC_BACKWARD) {
struct log_entry junk;
r = toku_log_fread(lc->cur_fp, &junk);
assert(r == 0);
toku_log_free_log_entry_resources(&junk);
}
} else {
fprintf(stderr, "Unexpected log format error '%s' in %s\n", strerror(r), lc->logfiles[lc->cur_logfiles_index]);
r = toku_logcursor_first(lc, le);
return r;
}
}
// read the entry
r = lc_log_read(lc);
if (r!=0) return r;
r = lc_check_lsn(lc, LC_FORWARD);
if (r!=0)
return r;
if (r!=0) return r;
lc->last_direction = LC_FORWARD;
lc->entry_valid = TRUE;
*le = &(lc->entry);
......@@ -301,35 +339,11 @@ int toku_logcursor_prev(TOKULOGCURSOR lc, struct log_entry **le) {
r = toku_logcursor_last(lc, le);
return r;
}
r = toku_log_fread_backward(lc->cur_fp, &(lc->entry));
while ( -1 == r) { // if within header length of top of file
// move to previous file
r = lc_close_cur_logfile(lc);
if (r!=0)
return r;
if ( lc->cur_logfiles_index == 0 )
return DB_NOTFOUND;
lc->cur_logfiles_index--;
r = lc_open_logfile(lc, lc->cur_logfiles_index);
if (r!=0)
return r;
// seek to end
r = fseek(lc->cur_fp, 0, SEEK_END);
assert(0==r);
r = toku_log_fread_backward(lc->cur_fp, &(lc->entry));
}
if (r!=0) {
if (r==DB_BADFORMAT) {
fprintf(stderr, "Bad log format in %s\n", lc->logfiles[lc->cur_logfiles_index]);
return r;
} else {
fprintf(stderr, "Unexpected log format error '%s' in %s\n", strerror(r), lc->logfiles[lc->cur_logfiles_index]);
return r;
}
}
// read the entry
r = lc_log_read_backward(lc);
if (r!=0) return r;
r = lc_check_lsn(lc, LC_BACKWARD);
if (r!=0)
return r;
if (r!=0) return r;
lc->last_direction = LC_BACKWARD;
lc->entry_valid = TRUE;
*le = &(lc->entry);
......@@ -353,24 +367,12 @@ int toku_logcursor_first(TOKULOGCURSOR lc, struct log_entry **le) {
return r;
lc->cur_logfiles_index = 0;
}
while (1) {
r = toku_log_fread(lc->cur_fp, &(lc->entry));
if (r==0)
break;
// move to next file
r = lc_close_cur_logfile(lc);
if (r!=0)
return r;
if ( lc->cur_logfiles_index == lc->n_logfiles-1)
return DB_NOTFOUND;
lc->cur_logfiles_index++;
r = lc_open_logfile(lc, lc->cur_logfiles_index);
if (r!= 0)
return r;
}
// read the entry
r = lc_log_read(lc);
if (r!=0) return r;
r = lc_check_lsn(lc, LC_FIRST);
if (r!=0)
return r;
if (r!=0) return r;
lc->last_direction = LC_FIRST;
lc->entry_valid = TRUE;
*le = &(lc->entry);
......@@ -402,6 +404,7 @@ int toku_logcursor_last(TOKULOGCURSOR lc, struct log_entry **le) {
if (r==0) // got a good entry
break;
if (r>0) {
toku_log_free_log_entry_resources(&(lc->entry));
// got an error,
// probably a corrupted last log entry due to a crash
// try scanning forward from the beginning to find the last good entry
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7