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

Merge pull request #5919 from gyuho/raft-lead

Browse Source 
raft: set leader id in stepFollower
This commit is contained in:
Gyu-Ho Lee 2016-07-11 18:34:07 -07:00 committed by GitHub
commit 8a21be721f
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
raft/raft.go
View File

@ -827,6 +827,7 @@ func stepFollower(r *raft, m pb.Message) {
r.handleHeartbeat(m) r.handleHeartbeat(m)
case pb.MsgSnap: case pb.MsgSnap:
r.electionElapsed = 0 r.electionElapsed = 0
r.lead = m.From
r.handleSnapshot(m) r.handleSnapshot(m)
case pb.MsgVote: case pb.MsgVote:
if (r.Vote == None || r.Vote == m.From) && r.raftLog.isUpToDate(m.Index, m.LogTerm) { if (r.Vote == None || r.Vote == m.From) && r.raftLog.isUpToDate(m.Index, m.LogTerm) {

4
raft/raft_test.go
View File

@ -1901,6 +1901,10 @@ func TestRestoreFromSnapMsg(t *testing.T) {
sm := newTestRaft(2, []uint64{1, 2}, 10, 1, NewMemoryStorage()) sm := newTestRaft(2, []uint64{1, 2}, 10, 1, NewMemoryStorage())
sm.Step(m) sm.Step(m)
if sm.lead != uint64(1) {
t.Errorf("sm.lead = %d, want 1", sm.lead)
}
// TODO(bdarnell): what should this test? // TODO(bdarnell): what should this test?
} }