From: Greg Farnum <greg@inktank.com>
Date: Mon, 25 Jun 2012 20:04:15 +0000 (-0700)
Subject: mon: don't tick the PaxosServices if we are currently slurping.
X-Git-Tag: v0.48argonaut~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=840ae244499496d543d634713bdee7c7884ce527;p=ceph.git

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 6861010508e..a75e307e823 100644
--- 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);