mon: don't tick the PaxosServices if we are currently slurping.

They aren't prepared to deal with the on-disk state being inconsistent.

Signed-off-by: Greg Farnum <greg@inktank.com>

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 6861010508e88942c8d91321b17756a8f235f9f8..a75e307e8233999757e6b0533813977dfc33ae89 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -1963,8 +1963,11 @@ void Monitor::tick()
   // ok go.
   dout(11) << "tick" << dendl;
   
-  for (vector<PaxosService*>::iterator p = paxos_service.begin(); p != paxos_service.end(); p++)
-    (*p)->tick();
+  if (!is_slurping()) {
+    for (vector<PaxosService*>::iterator p = paxos_service.begin(); p != paxos_service.end(); p++) {
+      (*p)->tick();
+    }
+  }
   
   // trim sessions
   utime_t now = ceph_clock_now(g_ceph_context);