From: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
Date: Tue, 10 Nov 2015 11:50:55 +0000 (+0100)
Subject: mon: revert MonitorDBStore's WholeStoreIteratorImpl::get
X-Git-Tag: v10.0.1~106^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F6522%2Fhead;p=ceph.git

mon: revert MonitorDBStore's WholeStoreIteratorImpl::get

Revert MonitorDBStore's WholeStoreIteratorImpl::get method to state
before commit 66b7b920cf5a0a9c71212573ef47fb2c7ea9b5ff until better,
long-term solution for #13742 will be provided.

Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
---

diff --git a/src/mon/MonitorDBStore.h b/src/mon/MonitorDBStore.h
index b9b0ee54c938..15558e3da986 100644
--- a/src/mon/MonitorDBStore.h
+++ b/src/mon/MonitorDBStore.h
@@ -507,12 +507,14 @@ class MonitorDBStore
   }
 
   int get(const string& prefix, const string& key, bufferlist& bl) {
-    
-    bufferlist outbl;
-    db->get(prefix, key, &outbl);
-    if (outbl.length() == 0) 
+    set<string> k;
+    k.insert(key);
+    map<string,bufferlist> out;
+
+    db->get(prefix, k, &out);
+    if (out.empty())
       return -ENOENT;
-    bl.append(outbl);
+    bl.append(out[key]);
 
     return 0;
   }