From: songbaisen <song.baisen@zte.com.cn>
Date: Fri, 8 Jul 2016 07:22:03 +0000 (+0800)
Subject: mon: remove the redundant cancel_probe_timeout function
X-Git-Tag: ses5-milestone5~310^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6d53fcd24a441732ae71a1142d93d443ff84f938;p=ceph.git

mon: remove the redundant cancel_probe_timeout function

 In _reset function we have cancel once, so here is no need.

Signed-off-by: song baisen <song.baisen@zte.com.cn>
---

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 10c8bfc1dc0c..12133f9bc038 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -1828,8 +1828,6 @@ void Monitor::start_election()
   logger->inc(l_mon_num_elections);
   logger->inc(l_mon_election_call);
 
-  cancel_probe_timeout();
-
   clog->info() << "mon." << name << " calling new monitor election\n";
   elector.call_election();
 }