Merge pull request #11737: jewel: collection_list shadow return value #

Reviewed-by: Loic Dachary <ldachary@redhat.com>
ceph · Nov 9, 2016 · 262de50 · 262de50
2 parents 01609a0 + 0ec4051
commit 262de50
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/osd/PGBackend.cc b/src/osd/PGBackend.cc
@@ -133,16 +133,18 @@ int PGBackend::objects_list_partial(
   int r = 0;
   while (!_next.is_max() && ls->size() < (unsigned)min) {
     vector<ghobject_t> objects;
-    int r = store->collection_list(
+    r = store->collection_list(
       ch,
       _next,
       ghobject_t::get_max(),
       parent->sort_bitwise(),
       max - ls->size(),
       &objects,
       &_next);
-    if (r != 0)
+    if (r != 0) {
+      derr << __func__ << " list collection " << ch << " got: " << cpp_strerror(r) << dendl;
       break;
+    }
     for (vector<ghobject_t>::iterator i = objects.begin();
 	 i != objects.end();
 	 ++i) {