]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
RGW Zipper - Make sure bucket list progresses 42625/head
authorDaniel Gryniewicz <dang@redhat.com>
Thu, 1 Apr 2021 18:24:09 +0000 (14:24 -0400)
committerCory Snyder <csnyder@iland.com>
Wed, 4 Aug 2021 10:30:01 +0000 (06:30 -0400)
The bucket list wrapper lost the automatic advancement of the marker for
each iteration.  Some places manually set that marker, and it worked
fine, but some depended on it being automatically set.  Fix it so that
the marker advances automatically each iteration.

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
(cherry picked from commit 9cd74053b8bd95d3dee6cac6723cb051768865c3)

src/rgw/rgw_sal_rados.cc

index 778bc9ba04917e27bb8de7922c8ae85fefdbaaaa..72551cc6a445967c3b5fe5759ae2a8c17c0d2d57 100644 (file)
@@ -374,6 +374,7 @@ int RGWRadosBucket::list(const DoutPrefixProvider *dpp, ListParams& params, int
   int ret = list_op.list_objects(dpp, max, &results.objs, &results.common_prefixes, &results.is_truncated, y);
   if (ret >= 0) {
     results.next_marker = list_op.get_next_marker();
+    params.marker = results.next_marker;
   }
 
   return ret;