Fix a comparison with garbage in Raft update processing code.

kvap · kvap · commit cdc172076bad · 2016-04-22T16:13:55.000+03:00
diff --git a/contrib/raftable/raft/src/raft.c b/contrib/raftable/raft/src/raft.c
@@ -814,8 +814,8 @@ static void raft_handle_update(raft_t r, raft_msg_update_t *m) {
 
 	if (!m->empty && !m->snapshot && !raft_appendable(r, m->previndex, m->prevterm)) goto finish;
 
-	if (reply.progress.entries > 0) {
-		reply.term = RAFT_LOG(r, reply.progress.entries - 1).term;
+	if (RAFT_LOG_LAST_INDEX(r) >= 0) {
+		reply.term = RAFT_LOG(r, RAFT_LOG_LAST_INDEX(r)).term;
 	} else {
 		reply.term = -1;
 	}

Original file line number	Diff line number	Diff line change
`@@ -814,8 +814,8 @@ static void raft_handle_update(raft_t r, raft_msg_update_t *m) {`
`814`	`814`
`815`	`815`	`if (!m->empty && !m->snapshot && !raft_appendable(r, m->previndex, m->prevterm)) goto finish;`
`816`	`816`
`817`		`- if (reply.progress.entries > 0) {`
`818`		`- reply.term = RAFT_LOG(r, reply.progress.entries - 1).term;`
	`817`	`+ if (RAFT_LOG_LAST_INDEX(r) >= 0) {`
	`818`	`+ reply.term = RAFT_LOG(r, RAFT_LOG_LAST_INDEX(r)).term;`
`819`	`819`	`} else {`
`820`	`820`	`reply.term = -1;`
`821`	`821`	`}`