Skip to content

Commit e69883a

Browse files
committed
crimson/.../scrub_events: use PGBackend::list_objects in ScrubScan::run
Fixes: https://tracker.ceph.com/issues/64975 Signed-off-by: Samuel Just <[email protected]>
1 parent 0d042f9 commit e69883a

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

src/crimson/osd/osd_operations/scrub_events.cc

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -145,17 +145,13 @@ ScrubScan::ifut<> ScrubScan::run(PG &pg)
145145
ret.valid_through = pg.get_info().last_update;
146146

147147
DEBUGDPP("begin: {}, end: {}", pg, begin, end);
148-
auto [objects, _] = co_await interruptor::make_interruptible(
149-
pg.shard_services.get_store().list_objects(
150-
pg.get_collection_ref(),
151-
ghobject_t(begin, ghobject_t::NO_GEN, pg.get_pgid().shard),
152-
ghobject_t(end, ghobject_t::NO_GEN, pg.get_pgid().shard),
153-
std::numeric_limits<uint64_t>::max())
154-
);
148+
auto [objects, _] = co_await pg.backend->list_objects(begin, end);
155149

156150
DEBUGDPP("listed {} objects", pg, objects);
157151
for (const auto &object: objects) {
158-
co_await scan_object(pg, object);
152+
co_await scan_object(
153+
pg,
154+
ghobject_t(object, ghobject_t::NO_GEN, pg.get_pgid().shard));
159155
}
160156

161157
if (local) {

0 commit comments

Comments
 (0)