From e7361176f4ad1d4b43a393e6e34c50233a73e829 Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Thu, 4 May 2017 22:49:04 +0800
Subject: [PATCH] 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)
---
 src/mon/Elector.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc
index 7bf552a86f597..c2c26b039b918 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) 
-- 
2.39.5