From: David Zafman <david.zafman@inktank.com>
Date: Tue, 20 May 2014 03:37:01 +0000 (-0700)
Subject: ceph_filestore_dump: Add get-omap object command
X-Git-Tag: v0.80.10~69^2~75
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7547f3d17bc89437c529aa96413b0bebb808da5e;p=ceph.git

ceph_filestore_dump: Add get-omap object command

Signed-off-by: David Zafman <david.zafman@inktank.com>
(cherry picked from commit b50c43ce5e52f5bbcb3684f6793d50f34ed741d1)
---

diff --git a/src/tools/ceph_filestore_dump.cc b/src/tools/ceph_filestore_dump.cc
index 2a2e8d29d88..aeab525cbb6 100644
--- a/src/tools/ceph_filestore_dump.cc
+++ b/src/tools/ceph_filestore_dump.cc
@@ -1361,6 +1361,37 @@ int do_rm_attr(ObjectStore *store, coll_t coll, ghobject_t &ghobj, string key)
   return 0;
 }
 
+int do_get_omap(ObjectStore *store, coll_t coll, ghobject_t &ghobj, string key)
+{
+  set<string> keys;
+  map<string, bufferlist> out;
+
+  keys.insert(key);
+
+  int r = store->omap_get_values(coll, ghobj, keys, &out);
+  if (r < 0) {
+    cerr << "omap_get_values: " << cpp_strerror(-r) << std::endl;
+    return r;
+  }
+
+  if (out.empty()) {
+    cerr << "Key not found" << std::endl;
+    return -ENOENT;
+  }
+
+  assert(out.size() == 1);
+
+  bufferlist bl = out.begin()->second;
+  string value(bl.c_str(), bl.length());
+  if (outistty) {
+    cleanbin(value);
+    value.push_back('\n');
+  }
+  cout << value;
+
+  return 0;
+}
+
 void usage(po::options_description &desc)
 {
     cerr << std::endl;
@@ -1816,6 +1847,13 @@ int main(int argc, char **argv)
 	if (r)
 	  ret = 1;
         goto out;
+      } else if (objcmd == "get-omap") {
+	if (vm.count("arg1") == 0)
+	  usage(desc);
+	r = do_get_omap(fs, coll, ghobj, arg1);
+	if (r)
+	  ret = 1;
+        goto out;
       }
       cerr << "Unknown object command '" << objcmd << "'" << std::endl;
       usage(desc);