Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

raft: update lead to none when receives vaild msgVote

Browse Source
This commit is contained in:
Xiang Li
2014-07-14 22:39:44 -07:00
committed by Yicheng Qin
parent 605c4ce702
commit 3921295b21
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
raft/raft.go
View File

@@ -311,7 +311,11 @@ func (sm *stateMachine) Step(m Message) (ok bool) {
case m.Term == 0:
// local message
case m.Term > sm.term.Get():
sm.becomeFollower(m.Term, m.From)
lead := m.From
if m.Type == msgVote {
lead = none
}
sm.becomeFollower(m.Term, lead)
case m.Term < sm.term.Get():
// ignore
return true

9
raft/raft_test.go
View File

@@ -685,7 +685,7 @@ func TestAllServerStepdown(t *testing.T) {
}
for j, msgType := range tmsgTypes {
sm.Step(Message{Type: msgType, Term: tterm, LogTerm: tterm})
sm.Step(Message{From: 1, Type: msgType, Term: tterm, LogTerm: tterm})
if sm.state != tt.wstate {
t.Errorf("#%d.%d state = %v , want %v", i, j, sm.state, tt.wstate)
@@ -696,6 +696,13 @@ func TestAllServerStepdown(t *testing.T) {
if int64(len(sm.log.ents)) != tt.windex {
t.Errorf("#%d.%d index = %v , want %v", i, j, len(sm.log.ents), tt.windex)
}
wlead := int64(1)
if msgType == msgVote {
wlead = none
}
if sm.lead.Get() != wlead {
t.Errorf("#%d, sm.lead = %d, want %d", i, sm.lead.Get(), none)
}
}
}
}