From c53a6e7dd2e7caa6b52a47dbd896a2df7bfc1746 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Fri, 1 Dec 2023 13:46:20 -0500 Subject: [PATCH] rgw/sysobj: pool_list_objects_init() initializes marker Fixes: https://tracker.ceph.com/issues/63717 Signed-off-by: Casey Bodley --- src/rgw/services/svc_sys_obj_core.cc | 2 +- src/rgw/services/svc_sys_obj_core_types.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/rgw/services/svc_sys_obj_core.cc b/src/rgw/services/svc_sys_obj_core.cc index fb9c7edce23..397709c5d99 100644 --- a/src/rgw/services/svc_sys_obj_core.cc +++ b/src/rgw/services/svc_sys_obj_core.cc @@ -612,7 +612,7 @@ int RGWSI_SysObj_Core::pool_list_objects_init(const DoutPrefixProvider *dpp, const string& prefix, RGWSI_SysObj::Pool::ListCtx *_ctx) { - _ctx->impl.emplace(prefix); + _ctx->impl.emplace(prefix, marker); auto& ctx = static_cast(*_ctx->impl); diff --git a/src/rgw/services/svc_sys_obj_core_types.h b/src/rgw/services/svc_sys_obj_core_types.h index 404f0fdde68..a7b6aed0842 100644 --- a/src/rgw/services/svc_sys_obj_core_types.h +++ b/src/rgw/services/svc_sys_obj_core_types.h @@ -30,6 +30,7 @@ struct RGWSI_SysObj_Core_PoolListImplInfo : public RGWSI_SysObj_Pool_ListInfo { rgw::AccessListFilter filter; std::string marker; - RGWSI_SysObj_Core_PoolListImplInfo(const std::string& prefix) - : filter(rgw::AccessListFilterPrefix(prefix)) {} + RGWSI_SysObj_Core_PoolListImplInfo(const std::string& prefix, + const std::string& marker) + : filter(rgw::AccessListFilterPrefix(prefix)), marker(marker) {} }; -- 2.39.5