From 8c178e0d39d8d4a4820eb061f79d74f95e60199f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 15 Jul 2013 10:05:37 -0700 Subject: [PATCH] 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. This is a backport of aa60f940ec1994a61624345586dc70d261688456. Fixes: #5621 Signed-off-by: Sage Weil Reviewed-by: Greg Farnum --- src/mon/Monitor.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 6a91215d31e82..127754f01f6f6 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -1523,6 +1523,10 @@ void Monitor::sync_start(entity_inst_t &other) set targets = get_sync_targets_names(); 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(); // assume 'other' as the leader. We will update the leader once we receive // a reply to the sync start. -- 2.39.5