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: v10.0.0~30^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d276d3286504ea702ae561b91dff4121c99feb9a;p=ceph.git

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

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index 93a4a332bcc6..12ae5aa6e0ae 100644
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -105,7 +105,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;
         }
         bufferlist::iterator bp = attr.begin();
         try {
@@ -114,7 +114,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);