From c6192d1d7a804f10283d79647d60e07b9c462ab9 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Thu, 10 Mar 2016 19:10:20 -0800 Subject: [PATCH] etcdserver: remove todo --- etcdserver/server.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/etcdserver/server.go b/etcdserver/server.go index dc401f69e..e9ab9e2d6 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -596,8 +596,6 @@ func (s *EtcdServer) applySnapshot(ep *etcdProgress, apply *apply) { plog.Panicf("rename snapshot file error: %v", err) } - // TODO: recover lessor - newbe := backend.NewDefaultBackend(fn) if err := s.kv.Restore(newbe); err != nil { plog.Panicf("restore KV error: %v", err) @@ -618,7 +616,7 @@ func (s *EtcdServer) applySnapshot(ep *etcdProgress, apply *apply) { s.bemu.Unlock() if s.lessor != nil { - s.lessor.Recover(s.be, s.kv) + s.lessor.Recover(newbe, s.kv) } } if err := s.store.Recovery(apply.snapshot.Data); err != nil {