ceph-objectstore-tool: For corrupt objectstores, don't abort listing on errors

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit d276d3286504ea702ae561b91dff4121c99feb9a)

Conflicts:
	src/tools/ceph_objectstore_tool.cc (trivial)

diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index af84b0fe051343b0e40ef3f91d8e8ec9a6bf180d..72f830295b4a1d1b24d496e4de97dcc551063583 100644 (file)
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -414,7 +414,7 @@ int _action_on_all_objects_in_pg(ObjectStore *store, coll_t coll, action_on_obje
       if (r < 0) {
        cerr << "Error getting attr on : " << make_pair(coll, *obj) << ", "
             << cpp_strerror(r) << std::endl;
-       return r;
+       continue;
       }
       object_info_t oi;
       bufferlist::iterator bp = attr.begin();
@@ -424,7 +424,7 @@ int _action_on_all_objects_in_pg(ObjectStore *store, coll_t coll, action_on_obje
        r = -EINVAL;
        cerr << "Error getting attr on : " << make_pair(coll, *obj) << ", "
             << cpp_strerror(r) << std::endl;
-       return r;
+       continue;
       }
       r = action.call(store, coll, *obj, oi);
       if (r < 0)