mon: PaxosService: cancel proposal timer after election

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>

diff --git a/src/mon/PaxosService.cc b/src/mon/PaxosService.cc
index db52667378cd284a2acd7a4957b2910ea6a00861..ef59327012d2985fd26e8f8f9048b6f26b20c3c6 100644 (file)
--- a/src/mon/PaxosService.cc
+++ b/src/mon/PaxosService.cc
@@ -149,6 +149,11 @@ void PaxosService::election_finished()
 {
   dout(10) << "election_finished" << dendl;
 
+  if (proposal_timer) {
+    mon->timer.cancel_event(proposal_timer);
+    proposal_timer = 0;
+  }
+
   if (have_pending) {
     discard_pending();
     have_pending = false;