Merge pull request #1792 from xiang90/fix_raft_l

raft: always write dummy entry to storage
etcd-io · Nov 26, 2014 · d01d611 · d01d611
2 parents 7614aa5 + 39e6631
commit d01d611
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/raft/log.go b/raft/log.go
@@ -216,8 +216,8 @@ func (l *raftLog) snap(d []byte, index, term uint64, nodes []uint64) {
 }
 
 func (l *raftLog) restore(s pb.Snapshot) {
-	l.ents = []pb.Entry{{Term: s.Term}}
-	l.unstable = s.Index + 1
+	l.ents = []pb.Entry{{Index: s.Index, Term: s.Term}}
+	l.unstable = s.Index
 	l.committed = s.Index
 	l.offset = s.Index
 	l.snapshot = s

diff --git a/raft/log_test.go b/raft/log_test.go
@@ -501,8 +501,8 @@ func TestLogRestore(t *testing.T) {
 	if raftLog.committed != index {
 		t.Errorf("comitted = %d, want %d", raftLog.committed, index)
 	}
-	if raftLog.unstable != index+1 {
-		t.Errorf("unstable = %d, want %d", raftLog.unstable, index+1)
+	if raftLog.unstable != index {
+		t.Errorf("unstable = %d, want %d", raftLog.unstable, index)
 	}
 	if raftLog.term(index) != term {
 		t.Errorf("term = %d, want %d", raftLog.term(index), term)