From: Haomai Wang <haomai@xsky.com>
Date: Sun, 9 Oct 2016 10:31:54 +0000 (+0800)
Subject: osd/PGBackend: fix collection_list shadow return value
X-Git-Tag: v0.94.10~43^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F11927%2Fhead;p=ceph.git

osd/PGBackend: fix collection_list shadow return value

Fixes: http://tracker.ceph.com/issues/17713
Signed-off-by: Haomai Wang <haomai@xsky.com>
(cherry picked from commit 8a53a604f375eb568a6fc88a402a6afd83fa151a)

Conflicts:
	src/osd/PGBackend.cc (master is using store->collection_list and ch;
            hammer is using store->collection_list_partial and coll)
---

diff --git a/src/osd/PGBackend.cc b/src/osd/PGBackend.cc
index ef8012df6316e..15ad655fad81d 100644
--- a/src/osd/PGBackend.cc
+++ b/src/osd/PGBackend.cc
@@ -124,7 +124,7 @@ 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_partial(
+    r = store->collection_list_partial(
       coll,
       _next,
       min - ls->size(),
@@ -132,8 +132,10 @@ int PGBackend::objects_list_partial(
       seq,
       &objects,
       &_next);
-    if (r != 0)
+    if (r != 0) {
+      derr << __func__ << " list collection " << coll << " got: " << cpp_strerror(r) << dendl;
       break;
+    }
     for (vector<ghobject_t>::iterator i = objects.begin();
 	 i != objects.end();
 	 ++i) {