From: David Zafman <dzafman@redhat.com>
Date: Wed, 12 Nov 2014 23:22:04 +0000 (-0800)
Subject: ceph_objectstore_tool: Fixes to make import work again
X-Git-Tag: v0.80.10~69^2~54
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5b4c2ee0902d94e6fa5bee67188fddcf0e0c38a2;p=ceph.git

ceph_objectstore_tool: Fixes to make import work again

The is_pg() call is now true even for pgs pending removal, fix broken
    finish_remove_pgs() by removing is_pg() check.
Need to add create_collection() to the initial transaction on import

Fixes: #10090

Signed-off-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 5ce09198bf475e5c3a2df26232fa04ba9912b103)

Conflicts:
	src/tools/ceph_objectstore_tool.cc
---

diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index ea4411cd15170..e3d4bc3992743 100644
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -507,7 +507,6 @@ int finish_remove_pgs(ObjectStore *store, uint64_t *next_removal_seq)
        it != ls.end();
        ++it) {
     spg_t pgid;
-    snapid_t snap;
 
     if (it->is_temp(pgid)) {
       cout << "finish_remove_pgs " << *it << " clearing temp" << std::endl;
@@ -515,10 +514,6 @@ int finish_remove_pgs(ObjectStore *store, uint64_t *next_removal_seq)
       continue;
     }
 
-    if (it->is_pg(pgid, snap)) {
-      continue;
-    }
-
     uint64_t seq;
     if (it->is_removal(&seq, &pgid)) {
       if (seq >= *next_removal_seq)