RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

logger: add replay_tolerance

This commit is contained in:
Thomas Schoebel-Theuer 2013-07-01 10:17:38 +02:00 committed by Thomas Schoebel-Theuer
parent 0ee23aa3ef
commit bfb6070d25
3 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
kernel/mars_trans_logger.c
View File

@ -2858,13 +2858,33 @@ void trans_logger_replay(struct trans_logger_brick *brick)
}
status = log_read(&input->logst, false, &lh, &buf, &len);
new_finished_pos = input->logst.log_pos + input->logst.offset;
MARS_RPL("read %lld %lld\n", finished_pos, new_finished_pos);
if (status == -EAGAIN) {
MARS_DBG("got -EAGAIN\n");
loff_t remaining = brick->replay_end_pos - new_finished_pos;
MARS_DBG("got -EAGAIN, remaining = %lld\n", remaining);
if (brick->replay_tolerance > 0 && remaining < brick->replay_tolerance) {
MARS_WRN("logfile is truncated at position %lld (end_pos = %lld, remaining = %lld, tolerance = %d)\n",
new_finished_pos,
brick->replay_end_pos,
remaining,
brick->replay_tolerance);
finished_pos = new_finished_pos;
brick->replay_code = status;
break;
}
brick_msleep(backoff);
if (backoff < 3000) {
backoff += 100;
} else {
MARS_WRN("logfile replay not possible at position %lld (end_pos = %lld, remaining = %lld), please check/repair your logfile in userspace by some tool!\n", finished_pos, brick->replay_end_pos, brick->replay_end_pos - finished_pos);
MARS_WRN("logfile replay not possible at position %lld (end_pos = %lld, remaining = %lld), please check/repair your logfile in userspace by some tool!\n",
new_finished_pos,
brick->replay_end_pos,
remaining);
brick->replay_code = status;
break;
}
continue;
}
@ -2874,9 +2894,6 @@ void trans_logger_replay(struct trans_logger_brick *brick)
break;
}
new_finished_pos = input->logst.log_pos + input->logst.offset;
MARS_RPL("read %lld %lld\n", finished_pos, new_finished_pos);
if ((!status && len <= 0) ||
new_finished_pos > brick->replay_end_pos) { // EOF -> wait until brick_thread_should_stop()
MARS_DBG("EOF at %lld (old = %lld, end_pos = %lld)\n", new_finished_pos, finished_pos, brick->replay_end_pos);

1
kernel/mars_trans_logger.h
View File

@ -149,6 +149,7 @@ struct trans_logger_brick {
loff_t replay_start_pos; // where to start replay
loff_t replay_end_pos; // end of replay
int new_input_nr; // whereto we should switchover ASAP
int replay_tolerance; // how many bytes to ignore at truncated logfiles
// readonly from outside
int log_input_nr; // where we are currently logging to
int old_input_nr; // where old IO requests may be on the fly

3
kernel/sy_old/mars_light.c
View File

@ -2810,6 +2810,9 @@ int _start_trans(struct mars_rotate *rot)
/* Supply all relevant parameters
*/
trans_brick->replay_mode = rot->replay_mode;
trans_brick->replay_tolerance = 0;
if (rot->todo_primary)
trans_brick->replay_tolerance = PAGE_SIZE * 2;
_init_trans_input(trans_input, rot->relevant_log, rot);
/* Connect to new transaction log