]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix cls_bucket_list_unordered() partial results 29692/head
authorMark Kogan <mkogan@redhat.com>
Thu, 15 Aug 2019 13:59:39 +0000 (09:59 -0400)
committerMark Kogan <mkogan@redhat.com>
Tue, 27 Aug 2019 11:21:11 +0000 (07:21 -0400)
returnied after -ENOENT dirent is encountered

(details in tracker issue below)

fixes: https://tracker.ceph.com/issues/41297

Signed-off-by: Mark Kogan <mkogan@redhat.com>
src/rgw/rgw_rados.cc

index 7389910588982d2734c429a13397b7db8f94c661..2b203006f6626da2ff8e92f6607e3bc163e93762 100644 (file)
@@ -7978,6 +7978,8 @@ int RGWRados::cls_bucket_list_ordered(RGWBucketInfo& bucket_info,
       if (r < 0 && r != -ENOENT) {
           return r;
       }
+    } else {
+        r = 0;
     }
     if (r >= 0) {
       ldout(cct, 10) << "RGWRados::cls_bucket_list_ordered: got " <<
@@ -8122,6 +8124,8 @@ int RGWRados::cls_bucket_list_unordered(RGWBucketInfo& bucket_info,
        if (r < 0 && r != -ENOENT) {
          return r;
        }
+      } else {
+        r = 0;
       }
 
       // at this point either r >=0 or r == -ENOENT