From: Sage Weil <sage@inktank.com>
Date: Tue, 18 Jun 2013 00:17:56 +0000 (-0700)
Subject: mon: fix mkfs monmap cleanup
X-Git-Tag: v0.67-rc1~175^2~26
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c47f271de0547f21ef97fd3d2c07608a278b3e83;p=ceph.git

mon: fix mkfs monmap cleanup

exists_key(a,b) was looking for "monmap/mkfs/monmap".

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
index aa9d94fd8cc7..10faf093327c 100644
--- a/src/mon/MonmapMonitor.cc
+++ b/src/mon/MonmapMonitor.cc
@@ -70,7 +70,7 @@ void MonmapMonitor::update_from_paxos(bool *need_bootstrap)
   dout(10) << "update_from_paxos got " << version << dendl;
   mon->monmap->decode(monmap_bl);
 
-  if (exists_key("mkfs", get_service_name())) {
+  if (mon->store->exists("mkfs", get_service_name())) {
     MonitorDBStore::Transaction t;
     erase_mkfs(&t);
     mon->store->apply_transaction(t);