osd/PGBackend: fix collection_list shadow return value

Fixes: http://tracker.ceph.com/issues/17713
Signed-off-by: Haomai Wang <haomai@xsky.com>

diff --git a/src/osd/PGBackend.cc b/src/osd/PGBackend.cc
index 4819ea04414cd7823b8830a3a3bb5d6d4baf033a..6359fb175752e39b116544811e12b3f72f41cb11 100644 (file)
--- a/src/osd/PGBackend.cc
+++ b/src/osd/PGBackend.cc
@@ -140,7 +140,7 @@ int PGBackend::objects_list_partial(
 
   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(),
@@ -148,8 +148,10 @@ int PGBackend::objects_list_partial(
       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) {