mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

etcdserver: recover from snapshot before applying requests

Browse Source
This commit is contained in:
Yicheng Qin
2014-11-14 00:10:46 -08:00
parent 7d0ffb3f12
commit f6a7f96967
2 changed files with 48 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
etcdserver/server.go
View File

@ -349,17 +349,6 @@ func (s *EtcdServer) run() {
}
s.sender.Send(rd.Messages)
// TODO(bmizerany): do this in the background, but take
// care to apply entries in a single goroutine, and not
// race them.
if len(rd.CommittedEntries) != 0 {
appliedi = s.apply(rd.CommittedEntries)
}
if rd.Snapshot.Index > snapi {
snapi = rd.Snapshot.Index
}
// recover from snapshot if it is more updated than current applied
if rd.Snapshot.Index > appliedi {
if err := s.store.Recovery(rd.Snapshot.Data); err != nil {
@ -367,9 +356,18 @@ func (s *EtcdServer) run() {
}
appliedi = rd.Snapshot.Index
}
// TODO(bmizerany): do this in the background, but take
// care to apply entries in a single goroutine, and not
// race them.
if len(rd.CommittedEntries) != 0 {
appliedi = s.apply(rd.CommittedEntries)
}
s.node.Advance()
if rd.Snapshot.Index > snapi {
snapi = rd.Snapshot.Index
}
if appliedi-snapi > s.snapCount {
s.snapshot(appliedi, nodes)
snapi = appliedi