vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2482 from xiang90/fix-raft 

raft: reply with the commit index when receives a smaller append message
release-2.1
Xiang Li 2015-03-11 10:34:25 -07:00
parent b1ff6ddd88 c643967a41
commit 2ca981d8cb
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
raft/raft.go
View File

@ -663,6 +663,11 @@ func stepFollower(r *raft, m pb.Message) {
}
func (r *raft) handleAppendEntries(m pb.Message) {
if m.Index < r.Commit {
r.send(pb.Message{To: m.From, Type: pb.MsgAppResp, Index: r.Commit})
return
}
if mlastIndex, ok := r.raftLog.maybeAppend(m.Index, m.LogTerm, m.Commit, m.Entries...); ok {
r.send(pb.Message{To: m.From, Type: pb.MsgAppResp, Index: mlastIndex})
} else {

20
raft/raft_paper_test.go
View File

@ -603,27 +603,33 @@ func TestFollowerCheckMsgApp(t *testing.T) {
tests := []struct {
term uint64
index uint64
windex uint64
wreject bool
wrejectHint uint64
}{
{ents[0].Term, ents[0].Index, false, 0},
{ents[0].Term, ents[0].Index + 1, true, 2},
{ents[0].Term + 1, ents[0].Index, true, 2},
{ents[1].Term, ents[1].Index, false, 0},
{3, 3, true, 2},
// match with committed entries
{0, 0, 1, false, 0},
{ents[0].Term, ents[0].Index, 1, false, 0},
// match with uncommitted entries
{ents[1].Term, ents[1].Index, 2, false, 0},
// unmatch with existing entry
{ents[0].Term, ents[1].Index, ents[1].Index, true, 2},
// unexisting entry
{ents[1].Term + 1, ents[1].Index + 1, ents[1].Index + 1, true, 2},
}
for i, tt := range tests {
storage := NewMemoryStorage()
storage.Append(ents)
r := newRaft(1, []uint64{1, 2, 3}, 10, 1, storage, 0)
r.loadState(pb.HardState{Commit: 2})
r.loadState(pb.HardState{Commit: 1})
r.becomeFollower(2, 2)
r.Step(pb.Message{From: 2, To: 1, Type: pb.MsgApp, Term: 2, LogTerm: tt.term, Index: tt.index})
msgs := r.readMessages()
wmsgs := []pb.Message{
{From: 1, To: 2, Type: pb.MsgAppResp, Term: 2, Index: tt.index, Reject: tt.wreject, RejectHint: tt.wrejectHint},
{From: 1, To: 2, Type: pb.MsgAppResp, Term: 2, Index: tt.windex, Reject: tt.wreject, RejectHint: tt.wrejectHint},
}
if !reflect.DeepEqual(msgs, wmsgs) {
t.Errorf("#%d: msgs = %+v, want %+v", i, msgs, wmsgs)