mon: Monitor: don't remove 'mon_sync' when clearing the store during abort

Otherwise, we will end up losing the monmap we backed up when we started
the sync, and the monitor may be unable to start if it is killed or
crashes in-between the sync abort and finishing a new sync.

Fixes: #5256 (partially)
Backport: cuttlefish

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 9910eab32f5c3d2f4eba314508031fa6b2dc396a..293f1741fe0ee6557fba3414440723691b492853 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -1330,7 +1330,6 @@ void Monitor::sync_requester_abort()
   // Given that we are explicitely aborting the whole sync process, we should
   // play it safe and clear the store.
   set<string> targets = get_sync_targets_names();
-  targets.insert("mon_sync");
   store->clear(targets);
 
   dout(1) << __func__ << " no longer a sync requester" << dendl;