Merge pull request #1419 from xiangli-cmu/raft_log_test

raft: add test for findConflict
2014-10-27 14:30:36 -07:00
parent 60cb18b6c2 460d6490ba
commit 74c257f63d
3 changed files with 93 additions and 10 deletions
--- a/raft/raft.go
+++ b/raft/raft.go
@ -349,8 +349,7 @@ func (r *raft) campaign() {
 		if i == r.id {
 			continue
 		}
-		lasti := r.raftLog.lastIndex()
-		r.send(pb.Message{To: i, Type: pb.MsgVote, Index: lasti, LogTerm: r.raftLog.term(lasti)})
+		r.send(pb.Message{To: i, Type: pb.MsgVote, Index: r.raftLog.lastIndex(), LogTerm: r.raftLog.lastTerm()})
 	}
 }