From: Joao Eduardo Luis <joao.luis@inktank.com>
Date: Wed, 17 Jul 2013 18:50:38 +0000 (+0100)
Subject: ceph_mon: obtain backup monmap if store is marked with 'force_sync'
X-Git-Tag: v0.67-rc1~43
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0ebf23cee84180a0ae8b9fc0d8c2463ca31e6cbc;p=ceph.git

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 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);