From 6f260d8628eb728141e8b76072fb4a869273e1bc Mon Sep 17 00:00:00 2001 From: Daniel Gryniewicz Date: Thu, 1 Apr 2021 14:24:09 -0400 Subject: [PATCH] RGW Zipper - Make sure bucket list progresses 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 (cherry picked from commit 9cd74053b8bd95d3dee6cac6723cb051768865c3) --- src/rgw/rgw_sal_rados.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rgw/rgw_sal_rados.cc b/src/rgw/rgw_sal_rados.cc index 778bc9ba049..72551cc6a44 100644 --- a/src/rgw/rgw_sal_rados.cc +++ b/src/rgw/rgw_sal_rados.cc @@ -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; -- 2.47.3