]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
ceph_objectstore_tool: Fixes to make import work again
authorDavid Zafman <dzafman@redhat.com>
Wed, 12 Nov 2014 23:22:04 +0000 (15:22 -0800)
committerDavid Zafman <dzafman@redhat.com>
Tue, 3 Mar 2015 18:44:17 +0000 (10:44 -0800)
commit5b4c2ee0902d94e6fa5bee67188fddcf0e0c38a2
treea6ae199e363acc7faa1b4c9958ad66e553406503
parente0dab883d29bd3a54b5707f8d3ea830f8a1ce516
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
src/tools/ceph_objectstore_tool.cc