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: check voteFor

Browse Source
This commit is contained in:
Xiang Li
2014-05-24 21:08:06 -07:00
committed by Yicheng Qin
parent c1c45575be
commit 93b08502e4
2 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
raft/raft.go
View File

@@ -288,6 +288,8 @@ func (sm *stateMachine) Step(m Message) {
case msgApp:
sm.becomeFollower(sm.term, m.From)
handleAppendEntries()
case msgVote:
sm.send(Message{To: m.From, Type: msgVoteResp, Index: -1})
case msgVoteResp:
gr := sm.poll(m.From, m.Index >= 0)
switch sm.q() {
@@ -303,11 +305,18 @@ func (sm *stateMachine) Step(m Message) {
case msgApp:
handleAppendEntries()
case msgVote:
if sm.log.isUpToDate(m.Index, m.LogTerm) {
switch sm.vote {
case m.From:
sm.send(Message{To: m.From, Type: msgVoteResp, Index: sm.log.lastIndex()})
} else {
sm.send(Message{To: m.From, Type: msgVoteResp, Index: -1})
return
case none:
if sm.log.isUpToDate(m.Index, m.LogTerm) {
sm.vote = m.From
sm.send(Message{To: m.From, Type: msgVoteResp, Index: sm.log.lastIndex()})
return
}
}
sm.send(Message{To: m.From, Type: msgVoteResp, Index: -1})
}
}
}

39
raft/raft_test.go
View File

@@ -346,32 +346,37 @@ func TestCommit(t *testing.T) {
func TestVote(t *testing.T) {
tests := []struct {
i, term int
voteFor int
w int
}{
{0, 0, -1},
{0, 1, -1},
{0, 2, -1},
{0, 3, 2},
{0, 0, none, -1},
{0, 1, none, -1},
{0, 2, none, -1},
{0, 3, none, 2},
{1, 0, -1},
{1, 1, -1},
{1, 2, -1},
{1, 3, 2},
{1, 0, none, -1},
{1, 1, none, -1},
{1, 2, none, -1},
{1, 3, none, 2},
{2, 0, -1},
{2, 1, -1},
{2, 2, 2},
{2, 3, 2},
{2, 0, none, -1},
{2, 1, none, -1},
{2, 2, none, 2},
{2, 3, none, 2},
{3, 0, -1},
{3, 1, -1},
{3, 2, 2},
{3, 3, 2},
{3, 0, none, -1},
{3, 1, none, -1},
{3, 2, none, 2},
{3, 3, none, 2},
{3, 2, 0, 2},
{3, 2, 1, -1},
}
for i, tt := range tests {
called := false
sm := &nsm{stateMachine{log: &log{ents: []Entry{{}, {Term: 2}, {Term: 2}}}}, nil}
sm := &nsm{stateMachine{vote: tt.voteFor, log: &log{ents: []Entry{{}, {Term: 2}, {Term: 2}}}}, nil}
sm.next = stepperFunc(func(m Message) {
called = true
if m.Index != tt.w {