From: Joao Eduardo Luis <joao.luis@inktank.com>
Date: Fri, 30 Nov 2012 17:16:35 +0000 (+0000)
Subject: mon: PaxosService: cancel proposal timer after election
X-Git-Tag: v0.55~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=494711e6c9cc79c74845c0dfb78456f39f27050c;p=ceph.git

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 db52667378cd..ef59327012d2 100644
--- 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;