|
@@ -660,6 +660,12 @@ func (s *EtcdServer) applySnapshot(ep *etcdProgress, apply *apply) {
|
|
|
|
|
|
|
|
newbe := backend.NewDefaultBackend(fn)
|
|
newbe := backend.NewDefaultBackend(fn)
|
|
|
|
|
|
|
|
|
|
+ if s.lessor != nil {
|
|
|
|
|
+ plog.Info("recovering lessor...")
|
|
|
|
|
+ s.lessor.Recover(newbe, s.kv)
|
|
|
|
|
+ plog.Info("finished recovering lessor")
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
plog.Info("restoring mvcc store...")
|
|
plog.Info("restoring mvcc store...")
|
|
|
|
|
|
|
|
if err := s.kv.Restore(newbe); err != nil {
|
|
if err := s.kv.Restore(newbe); err != nil {
|
|
@@ -686,12 +692,6 @@ func (s *EtcdServer) applySnapshot(ep *etcdProgress, apply *apply) {
|
|
|
s.be = newbe
|
|
s.be = newbe
|
|
|
s.bemu.Unlock()
|
|
s.bemu.Unlock()
|
|
|
|
|
|
|
|
- if s.lessor != nil {
|
|
|
|
|
- plog.Info("recovering lessor...")
|
|
|
|
|
- s.lessor.Recover(newbe, s.kv)
|
|
|
|
|
- plog.Info("finished recovering lessor")
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
plog.Info("recovering alarms...")
|
|
plog.Info("recovering alarms...")
|
|
|
if err := s.restoreAlarms(); err != nil {
|
|
if err := s.restoreAlarms(); err != nil {
|
|
|
plog.Panicf("restore alarms error: %v", err)
|
|
plog.Panicf("restore alarms error: %v", err)
|