RepoMirrors/mars
1
0
Fork 0
mirror of https://github.com/schoebel/mars synced 2025-03-11 07:47:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

main: prefer fetch from originating peer

Browse Source
This commit is contained in:
Thomas Schoebel-Theuer 2020-10-27 19:52:08 +01:00
parent dde0281e60
commit 4b08aacf2a
1 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
kernel/sy_old/mars_main.c
View File

@ -785,6 +785,7 @@ struct mars_rotate {
struct mars_dent *syncstatus_dent;
struct lamport_time sync_finish_stamp;
struct if_brick *if_brick;
const char *log_from_peer;
const char *fetch_path;
const char *fetch_peer;
const char *avoid_peer;
@ -804,6 +805,9 @@ struct mars_rotate {
loff_t dev_size;
loff_t start_pos;
loff_t end_pos;
int nr_members;
int tmp_members;
int retry_log_from;
int retry_recovery;
int max_sequence;
int fetch_round;
@ -2233,6 +2237,8 @@ int _update_file(struct mars_dent *parent, const char *switch_path, const char *
NULL, NULL);
if (status >= 0 && copy) {
copy->copy_limiter = &rot->fetch_limiter;
if (do_start)
rot->retry_log_from = 0;
#if 0
// FIXME: code is dead
if (copy->append_mode && copy->power.led_on &&
@ -2288,6 +2294,21 @@ int check_logfile(const char *peer, struct mars_dent *remote_dent, struct mars_d
status = -EINVAL;
goto done;
}
/* Try to prefer the peer which created the logfile.
* This need not coincide with the current primary.
* Reason: transitive fetch may get stuck in a cycle.
*/
if (rot->log_from_peer &&
strcmp(peer, rot->log_from_peer) &&
(remote_dent->d_serial < rot->repair_log_seq ||
remote_dent->d_serial > rot->repair_log_seq + 1 ||
rot->retry_log_from++ <= rot->nr_members)) {
MARS_DBG("peer '%s' != '%s' not the origin of '%s'\n",
peer, rot->log_from_peer,
rot->replay_link ? rot->replay_link->new_link : "");
status = -EAGAIN;
goto done;
}
// bookkeeping for serialization of logfile updates
if (remote_dent->d_serial > rot->fetch_serial) {
@ -3636,6 +3657,7 @@ void rot_destruct(void *_rot)
assign_dent(&rot->prev_log, NULL);
assign_dent(&rot->next_log, NULL);
assign_dent(&rot->syncstatus_dent, NULL);
brick_string_free(rot->log_from_peer);
brick_string_free(rot->fetch_path);
brick_string_free(rot->fetch_peer);
brick_string_free(rot->avoid_peer);
@ -3767,8 +3789,10 @@ int make_log_init(struct mars_dent *dent)
if (unlikely(status < 0)) {
goto done;
}
brick_string_free(rot->log_from_peer);
parse_logfile_name(replay_link->d_argv[0],
&rot->repair_log_seq, NULL);
&rot->repair_log_seq,
&rot->log_from_peer);
assign_dent(&rot->replay_link, replay_link);
@ -5127,6 +5151,8 @@ int make_bio(struct mars_dent *dent)
if (!rot)
goto done;
rot->tmp_members++;
/* for detach, both the logger and the bio must be gone */
if (rot->trans_brick)
rot->is_attached = true;
@ -6815,6 +6841,8 @@ static int _main_thread(void *data)
struct mars_rotate *rot = container_of(tmp, struct mars_rotate, rot_head);
rot->rot_activated = false;
rot->nr_members = rot->tmp_members;
rot->tmp_members = 0;
}
up_read(&rot_sem);