From: huangjun <huangjun@xsky.com>
Date: Tue, 24 Oct 2017 04:39:04 +0000 (+0800)
Subject: ceph-objectstore-tool: skip object with generated version
X-Git-Tag: v13.0.1~373^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ee2948b0b476769dde31aeb562bd92269ce12018;p=ceph.git

ceph-objectstore-tool: skip object with generated version

The object with generated vesion from clonerange2 will be deleted
or used as rollback source, but this object dont include OI_ATTR.

Signed-off-by: huangjun <huangjun@xsky.com>
---

diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index 6f01450d0212..ff4a49002769 100644
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -629,7 +629,7 @@ int ObjectStoreTool::export_files(ObjectStore *store, coll_t coll)
 	 i != objects.end();
 	 ++i) {
       assert(!i->hobj.is_meta());
-      if (i->is_pgmeta() || i->hobj.is_temp()) {
+      if (i->is_pgmeta() || i->hobj.is_temp() || !i->is_no_gen()) {
 	continue;
       }
       r = export_file(store, coll, *i);