]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
RGW Zipper - Make sure bucket list progresses 40553/head
authorDaniel Gryniewicz <dang@redhat.com>
Thu, 1 Apr 2021 18:24:09 +0000 (14:24 -0400)
committerDaniel Gryniewicz <dang@redhat.com>
Thu, 1 Apr 2021 18:24:09 +0000 (14:24 -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>
src/rgw/rgw_sal_rados.cc

index cf21f4fa86f62c577f8f16ac88c664a2271aaf8d..45c43ee3f3525a4d9fe13622c220cc1f9b93fda1 100644 (file)
@@ -569,6 +569,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;