]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix cls_bucket_list_unordered() partial results 30253/head
authorMark Kogan <mkogan@redhat.com>
Thu, 15 Aug 2019 13:59:39 +0000 (09:59 -0400)
committerNathan Cutler <ncutler@suse.com>
Mon, 9 Sep 2019 08:56:30 +0000 (10:56 +0200)
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>
(cherry picked from commit 06dcfb1bd3390d6b169342b624c0ba4d62210bbf)

Conflicts:
src/rgw/rgw_rados.cc
- git got confused; made the changes manually

src/rgw/rgw_rados.cc

index 32db310a0c96e4735610ef7a14c2c5c743844e8d..fb007d31dea00f690909851a588239c745488773 100644 (file)
@@ -13416,6 +13416,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 " <<
@@ -13526,6 +13528,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