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>

diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index 7705bdbfb32d7618954b1a4797cfbc6a7c6b10a3..6ac22ba20e5c82f5067926ac8f274990a5349c06 100644 (file)
--- 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);