Merge pull request #1792 from xiang90/fix_raft_l
raft: always write dummy entry to storagerelease-2.0 v0.5.0-alpha.4
commit
d01d6119e5
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue