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

etcdserver: do not applySnapshot twice

Browse Source
This commit is contained in:
Xiang Li 2014-11-25 14:53:49 -08:00
parent 74d8c7f457
commit 01cbcce8ba
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etcdserver/server.go
View File

@ -394,7 +394,6 @@ func (s *EtcdServer) run() {
if err := s.storage.SaveSnap(rd.Snapshot); err != nil {
log.Fatalf("etcdserver: create snapshot error: %v", err)
}
s.raftStorage.ApplySnapshot(rd.Snapshot)
snapi = rd.Snapshot.Metadata.Index
}

2
raft/log.go
View File

@ -245,6 +245,8 @@ func (l *raftLog) maybeCommit(maxIndex, term uint64) bool {
}
func (l *raftLog) restore(s pb.Snapshot) {
// TODO: rethink restore logic.
// This breaks the rule that raft never modifies storage.
err := l.storage.ApplySnapshot(s)
if err != nil {
panic(err) // TODO(bdarnell)