From: Sage Weil <sage@inktank.com>
Date: Sat, 13 Jul 2013 15:11:45 +0000 (-0700)
Subject: mon: once sync full is chosen, make sure we don't change our mind
X-Git-Tag: v0.67-rc1~71^2~6
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=aa60f940ec1994a61624345586dc70d261688456;p=ceph.git

mon: once sync full is chosen, make sure we don't change our mind

It is possible for a sequence like:

 - probe
 - first probe reply has paxos trim that indicates a full sync is
   needed
 - start sync
 - clear store
 - something happens that makes us abort and bootstrap (e.g., the
   provider mon restarts
 - probe
 - first probe reply has older paxos trim bound and we call an election
 - on election completion, we crash because we have no data.

Non-determinism of the probe decision aside, we need to ensure that
the info we share during probe (fc, lc) is accurate, and that once we
clear the store we know we *must* do a full sync.

Fixes: #5621
Backport: cuttlefish
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
---

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 86e8cc752c78a..914714d733ca9 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -853,6 +853,11 @@ void Monitor::sync_start(entity_inst_t &other, bool full)
     dout(10) << __func__ << " clearing prefixes " << targets << dendl;
     store->clear(targets);
 
+    // make sure paxos knows it has been reset.  this prevents a
+    // bootstrap and then different probe reply order from possibly
+    // deciding a partial or no sync is needed.
+    paxos->init();
+
     assert(g_conf->mon_sync_requester_kill_at != 2);
   }