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

kvap · kvap · commit 17a26e5e7ad9 · 2015-11-30T15:03:53.000+03:00
diff --git a/contrib/pg_dtm/dtmd/include/raft.h b/contrib/pg_dtm/dtmd/include/raft.h
@@ -140,5 +140,6 @@ void raft_tick(raft_t *r, int msec);
 void raft_handle_message(raft_t *r, raft_msg_t *m);
 raft_msg_t *raft_recv_message(raft_t *r);
 int raft_create_udp_socket(raft_t *r);
+void raft_start_next_term(raft_t *r);
 
 #endif
diff --git a/contrib/pg_dtm/dtmd/src/main.c b/contrib/pg_dtm/dtmd/src/main.c
@@ -141,7 +141,7 @@ static void set_next_gxid(xid_t value) {
 		assert(value <= last_gxid);
 		if (inrange(next_gxid + 1, threshold_gxid, value)) {
 			// Time to worry has come.
-			raft.term++;
+			raft_start_next_term(&raft);
 		} else {
 			// It is either too early to worry,
 			// or we have already increased the term.
diff --git a/contrib/pg_dtm/dtmd/src/raft.c b/contrib/pg_dtm/dtmd/src/raft.c
@@ -458,6 +458,8 @@ static void raft_handle_update(raft_t *r, raft_msg_update_t *m) {
 			r->log.first + r->log.size,
 			m->acked
 		);
+		raft_server_t *s = r->servers + sender;
+		s->acked = s->tosend = r->log.acked;
 	}
 
 	if (m->empty) {
@@ -537,6 +539,14 @@ static void raft_handle_done(raft_t *r, raft_msg_done_t *m) {
 		debug("[from %d] ============= refused\n", sender);
 		if (server->tosend > 0) {
 			// the client should have specified the last index it had gotten
+			if (server->tosend == m->index + 1) {
+				shout(
+					"[from %d] the last index I have is %d, but"
+					" I still refuse, this should not happen\n",
+					sender, m->index
+				);
+				assert(false);
+			}
 			server->tosend = m->index + 1;
 		}
 		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) {
 	r->votes = 0;
 }
 
+void raft_start_next_term(raft_t *r) {
+	assert(r->role == ROLE_LEADER);
+	r->term++;
+}
+
 static void raft_handle_claim(raft_t *r, raft_msg_claim_t *m) {
 	int candidate = m->msg.from;
 
