Commit17a26e5

committed

Make a new leader remember the 'tosend' value for the previous leader from its prior update messages.

1 parent8ead24b commit17a26e5Copy full SHA for 17a26e5

File tree

+17

-1

lines changed

+17

-1

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -140,5 +140,6 @@ void raft_tick(raft_t *r, int msec);`
`140`	`140`	`voidraft_handle_message(raft_tr,raft_msg_tm);`
`141`	`141`	`raft_msg_traft_recv_message(raft_tr);`
`142`	`142`	`intraft_create_udp_socket(raft_t*r);`
	`143`	`+voidraft_start_next_term(raft_t*r);`
`143`	`144`
`144`	`145`	`#endif`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ static void set_next_gxid(xid_t value) {`
`141`	`141`	`assert(value <=last_gxid);`
`142`	`142`	`if (inrange(next_gxid+1,threshold_gxid,value)) {`
`143`	`143`	`// Time to worry has come.`
`144`		`-raft.term++;`
	`144`	`+raft_start_next_term(&raft);`
`145`	`145`	`}else {`
`146`	`146`	`// It is either too early to worry,`
`147`	`147`	`// or we have already increased the term.`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -458,6 +458,8 @@ static void raft_handle_update(raft_t r, raft_msg_update_t m) {`
`458`	`458`	`r->log.first+r->log.size,`
`459`	`459`	`m->acked`
`460`	`460`	`);`
	`461`	`+raft_server_t*s=r->servers+sender;`
	`462`	`+s->acked=s->tosend=r->log.acked;`
`461`	`463`	`}`
`462`	`464`
`463`	`465`	`if (m->empty) {`
`@@ -537,6 +539,14 @@ static void raft_handle_done(raft_t r, raft_msg_done_t m) {`
`537`	`539`	`debug("[from %d] ============= refused\n",sender);`
`538`	`540`	`if (server->tosend>0) {`
`539`	`541`	`// the client should have specified the last index it had gotten`
	`542`	`+if (server->tosend==m->index+1) {`
	`543`	`+shout(`
	`544`	`+"[from %d] the last index I have is %d, but"`
	`545`	`+" I still refuse, this should not happen\n",`
	`546`	`+sender,m->index`
	`547`	`+);`
	`548`	`+assert(false);`
	`549`	`+}`
`540`	`550`	`server->tosend=m->index+1;`
`541`	`551`	`}`
`542`	`552`	`assert(server->tosend >=server->acked);// FIXME: remove this, because 'tosend' is actually allowed to be less than 'acked' if the follower has restarted`
`@@ -555,6 +565,11 @@ static void raft_set_term(raft_t *r, int term) {`
`555`	`565`	`r->votes=0;`
`556`	`566`	`}`
`557`	`567`
	`568`	`+voidraft_start_next_term(raft_t*r) {`
	`569`	`+assert(r->role==ROLE_LEADER);`
	`570`	`+r->term++;`
	`571`	`+}`
	`572`	`+`
`558`	`573`	`staticvoidraft_handle_claim(raft_tr,raft_msg_claim_tm) {`
`559`	`574`	`intcandidate=m->msg.from;`
`560`	`575`

Comments

(0)