diff options
| author | Joao Eduardo Luis <joao.luis@inktank.com> | 2013-06-19 02:21:58 +0100 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-06-18 21:56:53 -0700 |
| commit | af5a9861d7c6b4527b0d2312d0efa792910bafd9 (patch) | |
| tree | 95382e80b795f134ca20651052ab52cbf83a158c | |
| parent | 257490335ad59662d2e25eae9f61d8adcd958e9c (diff) | |
| download | ceph-af5a9861d7c6b4527b0d2312d0efa792910bafd9.tar.gz | |
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>
| -rw-r--r-- | src/mon/Monitor.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 9910eab32f5..293f1741fe0 100644 --- 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; |