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 22:00:57 -0700 |
| commit | 41e1a6beeef69136fe6ec3f31d07ea8c33d64cba (patch) | |
| tree | f9d8cf4a24b14743cf518fd003b3b8ce86935bf5 | |
| parent | 3383ba6326aeff6500df4792fcef65740dd6b3ea (diff) | |
| download | ceph-41e1a6beeef69136fe6ec3f31d07ea8c33d64cba.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>
(cherry picked from commit af5a9861d7c6b4527b0d2312d0efa792910bafd9)
| -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 af4289cce61..3ecff6a513a 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<string> targets = get_sync_targets_names(); - targets.insert("mon_sync"); store->clear(targets); dout(1) << __func__ << " no longer a sync requester" << dendl; |