From 840ae244499496d543d634713bdee7c7884ce527 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Mon, 25 Jun 2012 13:04:15 -0700 Subject: [PATCH] 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 --- src/mon/Monitor.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 6861010508e88..a75e307e82339 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::iterator p = paxos_service.begin(); p != paxos_service.end(); p++) - (*p)->tick(); + if (!is_slurping()) { + for (vector::iterator p = paxos_service.begin(); p != paxos_service.end(); p++) { + (*p)->tick(); + } + } // trim sessions utime_t now = ceph_clock_now(g_ceph_context); -- 2.39.5