From: Sage Weil <sage@redhat.com>
Date: Wed, 19 Nov 2014 23:18:14 +0000 (-0800)
Subject: ceph-objectstore-tool: skip pgmeta object on export
X-Git-Tag: v0.91~23^2~26
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e247cd4be46f4197770032ca3ed776ab1b3d72d6;p=ceph.git

ceph-objectstore-tool: skip pgmeta object on export

We will (eventually) export the contents of this object explicitly as
PG metadata.

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

diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index 1d430e8f9f7..f9d2687a2d5 100644
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -376,6 +376,8 @@ int _action_on_all_objects_in_pg(ObjectStore *store, coll_t coll, action_on_obje
     for (vector<ghobject_t>::iterator obj = list.begin();
 	 obj != list.end();
 	 ++obj) {
+      if (obj->is_pgmeta())
+	continue;
       bufferlist attr;
       r = store->getattr(coll, *obj, OI_ATTR, attr);
       if (r < 0) {
@@ -919,6 +921,9 @@ int export_files(ObjectStore *store, coll_t coll)
     for (vector<ghobject_t>::iterator i = objects.begin();
 	 i != objects.end();
 	 ++i) {
+      if (i->is_pgmeta()) {
+	continue;
+      }
       r = export_file(store, coll, *i);
       if (r < 0)
         return r;