From e69883ad2a05afab9d9ab02b098ad2418a4eec8a Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Mon, 25 Mar 2024 23:17:10 -0700 Subject: [PATCH] crimson/.../scrub_events: use PGBackend::list_objects in ScrubScan::run Fixes: https://tracker.ceph.com/issues/64975 Signed-off-by: Samuel Just --- src/crimson/osd/osd_operations/scrub_events.cc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/crimson/osd/osd_operations/scrub_events.cc b/src/crimson/osd/osd_operations/scrub_events.cc index 1d109db4851cb..0ee6d6809f64d 100644 --- a/src/crimson/osd/osd_operations/scrub_events.cc +++ b/src/crimson/osd/osd_operations/scrub_events.cc @@ -145,17 +145,13 @@ ScrubScan::ifut<> ScrubScan::run(PG &pg) ret.valid_through = pg.get_info().last_update; DEBUGDPP("begin: {}, end: {}", pg, begin, end); - auto [objects, _] = co_await interruptor::make_interruptible( - pg.shard_services.get_store().list_objects( - pg.get_collection_ref(), - ghobject_t(begin, ghobject_t::NO_GEN, pg.get_pgid().shard), - ghobject_t(end, ghobject_t::NO_GEN, pg.get_pgid().shard), - std::numeric_limits::max()) - ); + auto [objects, _] = co_await pg.backend->list_objects(begin, end); DEBUGDPP("listed {} objects", pg, objects); for (const auto &object: objects) { - co_await scan_object(pg, object); + co_await scan_object( + pg, + ghobject_t(object, ghobject_t::NO_GEN, pg.get_pgid().shard)); } if (local) { -- 2.39.5