crimson/osd: cancel timers before restart

otherwise we will rearm already-armed timer when booting up OSD again.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc
index 20f66b26b53dd77f7182e6fbe16d0901a0970202..8d2e4e5ed04ba462569e481c8283503edffe8628 100644 (file)
--- a/src/crimson/osd/osd.cc
+++ b/src/crimson/osd/osd.cc
@@ -613,6 +613,8 @@ bool OSD::should_restart() const
 
 seastar::future<> OSD::restart()
 {
+  beacon_timer.cancel();
+  heartbeat_timer.cancel();
   up_epoch = 0;
   bind_epoch = osdmap->get_epoch();
   // TODO: promote to shutdown if being marked down for multiple times