From 41e1a6beeef69136fe6ec3f31d07ea8c33d64cba Mon Sep 17 00:00:00 2001 From: Joao Eduardo Luis Date: Wed, 19 Jun 2013 02:21:58 +0100 Subject: [PATCH] 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 Reviewed-by: Sage Weil (cherry picked from commit af5a9861d7c6b4527b0d2312d0efa792910bafd9) --- src/mon/Monitor.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index af4289cce614d..3ecff6a513a41 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -1321,7 +1321,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 targets = get_sync_targets_names(); - targets.insert("mon_sync"); store->clear(targets); dout(1) << __func__ << " no longer a sync requester" << dendl; -- 2.39.5