]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph_objectstore_tool: import-rados shouldn't import internal namespace objects
authorDavid Zafman <dzafman@redhat.com>
Fri, 12 Dec 2014 23:01:24 +0000 (15:01 -0800)
committerDavid Zafman <dzafman@redhat.com>
Tue, 3 Mar 2015 19:20:59 +0000 (11:20 -0800)
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit f727d2eaf50b0351feb9f12dcd65d50fb6eff7e9)

src/tools/ceph_objectstore_tool.cc

index 1e750a3cda1361122f01ac048b8afc293ccf0f3c..036bdea1eef123b0fc6d7f96a9b5509e492e7589 100644 (file)
@@ -1170,6 +1170,13 @@ int get_object_rados(librados::IoCtx &ioctx, bufferlist &bl)
   omap_hdr_section oh;
   omap_section os;
 
+  assert(g_ceph_context);
+  if (ob.hoid.hobj.nspace == g_ceph_context->_conf->osd_hit_set_namespace) {
+    cout << "Skipping internal object " << ob.hoid << std::endl;
+    skip_object(bl);
+    return 0;
+  }
+
   if (!ob.hoid.hobj.is_head()) {
     cout << "Skipping non-head for " << ob.hoid << std::endl;
     skip_object(bl);