From 4804c45e14829471f749c0bcf70370351613be1d Mon Sep 17 00:00:00 2001 From: Yicheng Qin Date: Mon, 8 Dec 2014 15:39:10 -0800 Subject: [PATCH] raft: set raft.Commit too when setting raftLog.committed --- etcdserver/server_test.go | 4 ---- raft/node.go | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/etcdserver/server_test.go b/etcdserver/server_test.go index 14574b541..d8f72f22a 100644 --- a/etcdserver/server_test.go +++ b/etcdserver/server_test.go @@ -943,10 +943,6 @@ func TestTriggerSnap(t *testing.T) { ctx := context.Background() s := raft.NewMemoryStorage() n := raft.StartNode(0xBAD0, mustMakePeerSlice(t, 0xBAD0), 10, 1, s) - rd := <-n.Ready() - s.Append(rd.Entries) - n.Advance() - n.ApplyConfChange(raftpb.ConfChange{Type: raftpb.ConfChangeAddNode, NodeID: 0xBAD0}) n.Campaign(ctx) st := &storeRecorder{} p := &storageRecorder{} diff --git a/raft/node.go b/raft/node.go index b0d0ab6a5..2e3fbfb91 100644 --- a/raft/node.go +++ b/raft/node.go @@ -150,6 +150,7 @@ func StartNode(id uint64, peers []Peer, election, heartbeat int, storage Storage // TODO(bdarnell): These entries are still unstable; do we need to preserve // the invariant that committed < unstable? r.raftLog.committed = r.raftLog.lastIndex() + r.Commit = r.raftLog.committed // Now apply them, mainly so that the application can call Campaign // immediately after StartNode in tests. Note that these nodes will // be added to raft twice: here and when the application's Ready