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

all: replace replay magic numbers by named constants

This commit is contained in:
Thomas Schoebel-Theuer 2018-04-09 16:15:00 +02:00
parent f53d3912cc
commit d32251179b
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/mars_trans_logger.c
View File

@ -2592,7 +2592,7 @@ void trans_logger_log(struct trans_logger_brick *brick)
int nr_flying;
memset(brick->rkd, 0, sizeof(brick->rkd));
brick->replay_code = 0; // indicates "running"
brick->replay_code = TL_REPLAY_RUNNING;
brick->disk_io_error = 0;
_init_inputs(brick, true);
@ -2896,7 +2896,7 @@ void trans_logger_replay(struct trans_logger_brick *brick)
int backoff = 0;
int status = 0;
brick->replay_code = 0; // indicates "running"
brick->replay_code = TL_REPLAY_RUNNING;
brick->disk_io_error = 0;
start_pos = brick->replay_start_pos;
@ -3037,10 +3037,10 @@ void trans_logger_replay(struct trans_logger_brick *brick)
if (status >= 0 && finished_pos == brick->replay_end_pos) {
MARS_INF("replay finished at %lld\n", finished_pos);
brick->replay_code = 1;
brick->replay_code = TL_REPLAY_FINISHED;
} else if (status == -EAGAIN && finished_pos + brick->replay_tolerance > brick->replay_end_pos) {
MARS_INF("TOLERANCE: logfile is incomplete at %lld (of %lld)\n", finished_pos, brick->replay_end_pos);
brick->replay_code = 2;
brick->replay_code = TL_REPLAY_INCOMPLETE;
} else if (status < 0) {
if (finished_pos < 0)
finished_pos = new_finished_pos;
@ -3052,7 +3052,7 @@ void trans_logger_replay(struct trans_logger_brick *brick)
brick->replay_code = status;
} else {
MARS_INF("replay stopped prematurely at %lld (of %lld)\n", finished_pos, brick->replay_end_pos);
brick->replay_code = 2;
brick->replay_code = TL_REPLAY_INCOMPLETE;
}
for (;;) {

4
kernel/mars_trans_logger.h
View File

@ -105,6 +105,10 @@ struct logger_head {
#endif
#define TL_REPLAY_RUNNING 0
#define TL_REPLAY_FINISHED 1
#define TL_REPLAY_INCOMPLETE 2
struct writeback_info {
struct trans_logger_brick *w_brick;
struct logger_head w_lh;

17
kernel/sy_old/mars_main.c
View File

@ -3505,7 +3505,7 @@ void _rotate_trans(struct mars_rotate *rot)
}
trans_brick->new_input_nr = next_nr;
MARS_INF_TO(rot->log_say, "started logrotate switchover from '%s' to '%s'\n", rot->relevant_log->d_path, rot->next_relevant_log->d_path);
rot->replay_code = 0;
rot->replay_code = TL_REPLAY_RUNNING;
}
done: ;
}
@ -3609,7 +3609,7 @@ int _start_trans(struct mars_rotate *rot)
trans_brick->replay_mode = rot->replay_mode;
trans_brick->replay_tolerance = REPLAY_TOLERANCE;
_init_trans_input(trans_input, rot->relevant_log, rot);
rot->replay_code = 0;
rot->replay_code = TL_REPLAY_RUNNING;
/* Connect to new transaction log
*/
@ -3779,23 +3779,24 @@ int make_log_finalize(struct mars_global *global, struct mars_dent *dent)
rot->log_is_really_damaged = false;
if (trans_brick->replay_mode) {
write_info_links(rot);
if (trans_brick->replay_code > 0) {
if (trans_brick->replay_code > TL_REPLAY_RUNNING) {
MARS_INF_TO(rot->log_say, "logfile replay ended successfully at position %lld\n", trans_brick->replay_current_pos);
if (rot->replay_code >= 0)
if (rot->replay_code >= TL_REPLAY_RUNNING)
rot->replay_code = trans_brick->replay_code;
} else if (trans_brick->replay_code == -EAGAIN ||
trans_brick->replay_code == TL_REPLAY_INCOMPLETE ||
trans_brick->replay_end_pos - trans_brick->replay_current_pos < trans_brick->replay_tolerance) {
MARS_INF_TO(rot->log_say, "logfile replay stopped intermediately at position %lld\n", trans_brick->replay_current_pos);
} else if (trans_brick->replay_code < 0) {
} else if (trans_brick->replay_code < TL_REPLAY_RUNNING) {
MARS_ERR_TO(rot->log_say, "logfile replay stopped with error = %d at position %lld\n", trans_brick->replay_code, trans_brick->replay_current_pos);
make_rot_msg(rot, "err-replay-stop", "logfile replay stopped with error = %d at position %lld", trans_brick->replay_code, trans_brick->replay_current_pos);
rot->replay_code = trans_brick->replay_code;
rot->log_is_really_damaged = true;
} else if (rot->replay_code >= 0) {
} else if (rot->replay_code >= TL_REPLAY_RUNNING) {
rot->replay_code = trans_brick->replay_code;
}
} else {
rot->replay_code = 0;
rot->replay_code = TL_REPLAY_RUNNING;
}
__show_actual(parent->d_path, "replay-code", rot->replay_code);
@ -3807,7 +3808,7 @@ int make_log_finalize(struct mars_global *global, struct mars_dent *dent)
rot->is_log_damaged =
trans_brick->replay_code == -EAGAIN &&
trans_brick->replay_end_pos - trans_brick->replay_current_pos < trans_brick->replay_tolerance;
do_stop = trans_brick->replay_code != 0 ||
do_stop = trans_brick->replay_code != TL_REPLAY_RUNNING ||
!global->global_power.button ||
!_check_allow(global, parent, "allow-replay") ||
!_check_allow(global, parent, "attach") ;