From: Kefu Chai <kchai@redhat.com>
Date: Thu, 4 May 2017 14:49:04 +0000 (+0800)
Subject: mon/Elector: call cancel_timer() in shutdown()
X-Git-Tag: v12.0.3~66^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=12139ae529a49b6caedea89f910d034ddca094b6;p=ceph.git

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

instead of doing it manually.

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

diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc
index c3c8fd8845f..c2da8bbb40d 100644
--- a/src/mon/Elector.cc
+++ b/src/mon/Elector.cc
@@ -42,8 +42,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)