mon/Elector: call cancel_timer() in shutdown()

instead of doing it manually.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 12139ae529a49b6caedea89f910d034ddca094b6)

diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc
index 635d6da0a80a05c95c219ace47c2a54f6f71e947..4b7b869287e75e48a01926ee67e312750a311931 100644 (file)
--- a/src/mon/Elector.cc
+++ b/src/mon/Elector.cc
@@ -43,8 +43,7 @@ void Elector::init()
 
 void Elector::shutdown()
 {
-  if (expire_event)
-    mon->timer.cancel_event(expire_event);
+  cancel_timer();
 }
 
 void Elector::bump_epoch(epoch_t e)