diff options
| author | Joao Eduardo Luis <joao.luis@inktank.com> | 2013-05-30 18:17:28 +0100 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-05-30 11:43:12 -0700 |
| commit | 8b7ca687ded06fe0b67d98e81fa1dabbed440853 (patch) | |
| tree | b8b71ff1924c365738c059a39a70143ca5b04299 | |
| parent | 02ef6e918e4fe0368b02fbc700a4d921ae298dc3 (diff) | |
| download | ceph-8b7ca687ded06fe0b67d98e81fa1dabbed440853.tar.gz | |
mon: Monitor: backup monmap using all ceph features instead of quorum's
When a monitor is freshly created and for some reason its initial sync is
aborted, it will end up with an incorrect backup monmap. This monmap is
incorrect in the sense that it will not contain the monitor's names as
it will expect on the next run.
This results from us being using the quorum features to encode the monmap
when backing it up, instead of CEPH_FEATURES_ALL.
Fixes: #5203
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
(cherry picked from commit 626de387e617db457d6d431c16327c275b0e8a34)
| -rw-r--r-- | src/mon/Monitor.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 3c40ad38085..336f508c56a 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -1350,7 +1350,7 @@ void Monitor::sync_store_init() return; // this is moot } else { dout(10) << __func__ << " backup current monmap" << dendl; - monmap->encode(latest_monmap, get_quorum_features()); + monmap->encode(latest_monmap, CEPH_FEATURES_ALL); } } |