mon: debug proposal timers

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/mon/PaxosService.cc b/src/mon/PaxosService.cc
index b2a734a9b6c9a9629db9ad7e7750eff3161c0f25..fb704ca7a97d37d993118bda004f397b27114af1 100644 (file)
--- a/src/mon/PaxosService.cc
+++ b/src/mon/PaxosService.cc
@@ -95,11 +95,11 @@ bool PaxosService::dispatch(PaxosServiceMessage *m)
       } else {
        // delay a bit
        if (!proposal_timer) {
-         dout(10) << " setting propose timer with delay of " << delay << dendl;
          proposal_timer = new C_Propose(this);
+         dout(10) << " setting proposal_timer " << proposal_timer << " with delay of " << delay << dendl;
          mon->timer.add_event_after(delay, proposal_timer);
        } else { 
-         dout(10) << " propose timer already set" << dendl;
+         dout(10) << " proposal_timer already set" << dendl;
        }
       }
     } else {
@@ -168,8 +168,9 @@ void PaxosService::propose_pending()
     return;
 
   if (proposal_timer) {
+    dout(10) << " canceling proposal_timer " << proposal_timer << dendl;
     mon->timer.cancel_event(proposal_timer);
-    proposal_timer = 0;
+    proposal_timer = NULL;
   }
 
   /**
@@ -224,6 +225,7 @@ void PaxosService::restart()
 {
   dout(10) << "restart" << dendl;
   if (proposal_timer) {
+    dout(10) << " canceling proposal_timer " << proposal_timer << dendl;
     mon->timer.cancel_event(proposal_timer);
     proposal_timer = 0;
   }
@@ -238,6 +240,7 @@ void PaxosService::election_finished()
   dout(10) << "election_finished" << dendl;
 
   if (proposal_timer) {
+    dout(10) << " canceling proposal_timer " << proposal_timer << dendl;
     mon->timer.cancel_event(proposal_timer);
     proposal_timer = 0;
   }
@@ -307,6 +310,7 @@ void PaxosService::shutdown()
   cancel_events();
 
   if (proposal_timer) {
+    dout(10) << " canceling proposal_timer " << proposal_timer << dendl;
     mon->timer.cancel_event(proposal_timer);
     proposal_timer = 0;
   }