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: cleanup main loop

Browse Source
This commit is contained in:
Xiang Li 2014-11-25 14:38:18 -08:00
parent 7e6e305c4f
commit 74d8c7f457
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etcdserver/server.go
View File

@ -389,6 +389,7 @@ func (s *EtcdServer) run() {
} }
} }
// apply snapshot to storage if it is more updated than current snapi
if !raft.IsEmptySnap(rd.Snapshot) && rd.Snapshot.Metadata.Index > snapi { if !raft.IsEmptySnap(rd.Snapshot) && rd.Snapshot.Metadata.Index > snapi {
if err := s.storage.SaveSnap(rd.Snapshot); err != nil { if err := s.storage.SaveSnap(rd.Snapshot); err != nil {
log.Fatalf("etcdserver: create snapshot error: %v", err) log.Fatalf("etcdserver: create snapshot error: %v", err)
@ -396,15 +397,17 @@ func (s *EtcdServer) run() {
s.raftStorage.ApplySnapshot(rd.Snapshot) s.raftStorage.ApplySnapshot(rd.Snapshot)
snapi = rd.Snapshot.Metadata.Index snapi = rd.Snapshot.Metadata.Index
} }
if err := s.storage.Save(rd.HardState, rd.Entries); err != nil { if err := s.storage.Save(rd.HardState, rd.Entries); err != nil {
log.Fatalf("etcdserver: save state and entries error: %v", err) log.Fatalf("etcdserver: save state and entries error: %v", err)
} }
s.raftStorage.Append(rd.Entries) s.raftStorage.Append(rd.Entries)
s.sendhub.Send(rd.Messages) s.sendhub.Send(rd.Messages)
if !raft.IsEmptySnap(rd.Snapshot) { // recover from snapshot if it is more updated than current applied
// recover from snapshot if it is more updated than current applied if !raft.IsEmptySnap(rd.Snapshot) && rd.Snapshot.Metadata.Index > appliedi {
if rd.Snapshot.Metadata.Index > appliedi { {
if err := s.store.Recovery(rd.Snapshot.Data); err != nil { if err := s.store.Recovery(rd.Snapshot.Data); err != nil {
log.Panicf("recovery store error: %v", err) log.Panicf("recovery store error: %v", err)
} }