From c3fcbe636ae1a936b9180628cff939b2b5dddf7c Mon Sep 17 00:00:00 2001 From: David Zafman Date: Fri, 12 Dec 2014 15:01:24 -0800 Subject: [PATCH] ceph_objectstore_tool: import-rados shouldn't import internal namespace objects Signed-off-by: David Zafman (cherry picked from commit f727d2eaf50b0351feb9f12dcd65d50fb6eff7e9) --- src/tools/ceph_objectstore_tool.cc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc index 1e750a3cda136..036bdea1eef12 100644 --- a/src/tools/ceph_objectstore_tool.cc +++ b/src/tools/ceph_objectstore_tool.cc @@ -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); -- 2.39.5