raft: fix elapsed reset

This commit is contained in:
Xiang Li 2014-09-02 21:55:42 -07:00 committed by Yicheng Qin
parent 01be21985d
commit 966cfd6e8e

View File

@ -444,7 +444,6 @@ func stepCandidate(r *raft, m pb.Message) {
case msgProp:
panic("no leader")
case msgApp:
r.elapsed = 0
r.becomeFollower(r.Term, m.From)
r.handleAppendEntries(m)
case msgSnap:
@ -480,8 +479,8 @@ func stepFollower(r *raft, m pb.Message) {
r.elapsed = 0
r.handleSnapshot(m)
case msgVote:
// TODO(xiang): maybe reset elapsed?
if (r.Vote == none || r.Vote == m.From) && r.raftLog.isUpToDate(m.Index, m.LogTerm) {
r.elapsed = 0
r.Vote = m.From
r.send(pb.Message{To: m.From, Type: msgVoteResp, Index: r.raftLog.lastIndex()})
} else {