From: David Zafman <dzafman@redhat.com>
Date: Fri, 2 Oct 2015 02:28:54 +0000 (-0700)
Subject: ceph-objectstore-tool: For corrupt objectstores, don't abort listing on errors
X-Git-Tag: v0.94.7~28^2~1^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fd518e704e0e5c01f3b7efa8905ddde1e64cc842;p=ceph.git

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 af84b0fe0513..72f830295b4a 100644
--- 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)