summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoao Eduardo Luis <joao.luis@inktank.com>2013-07-17 19:50:38 +0100
committerSage Weil <sage@inktank.com>2013-07-17 14:12:13 -0700
commit0ebf23cee84180a0ae8b9fc0d8c2463ca31e6cbc (patch)
tree5f2b7414f9f8d1a2dafa1cdb3810f091decab580
parentd1501938f5d07c067d908501fc5cfe3c857d7281 (diff)
downloadceph-0ebf23cee84180a0ae8b9fc0d8c2463ca31e6cbc.tar.gz
ceph_mon: obtain backup monmap if store is marked with 'force_sync'
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com>
-rw-r--r--src/ceph_mon.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index 7705bdbfb32..6ac22ba20e5 100644
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -76,7 +76,8 @@ int obtain_monmap(MonitorDBStore &store, bufferlist &bl)
}
}
- if (store.exists("mon_sync", "in_sync")) {
+ if (store.exists("mon_sync", "in_sync")
+ || store.exists("mon_sync", "force_sync")) {
dout(10) << __func__ << " detected aborted sync" << dendl;
if (store.exists("mon_sync", "latest_monmap")) {
int err = store.get("mon_sync", "latest_monmap", bl);