Skip to content

Commit 9f39124

Browse files
committed
crimson/.../scrub_events: use PGBackend::list_objects in ScrubFindRange::run
Signed-off-by: Samuel Just <[email protected]>
1 parent 5b0416a commit 9f39124

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

src/crimson/osd/osd_operations/scrub_events.cc

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,19 +88,15 @@ ScrubFindRange::ifut<> ScrubFindRange::run(PG &pg)
8888
{
8989
LOG_PREFIX(ScrubFindRange::run);
9090
using crimson::common::local_conf;
91-
auto [_, next] = co_await interruptor::make_interruptible(
92-
pg.shard_services.get_store().list_objects(
93-
pg.get_collection_ref(),
94-
ghobject_t(begin, ghobject_t::NO_GEN, pg.get_pgid().shard),
95-
ghobject_t::get_max(),
96-
local_conf().get_val<int64_t>("osd_scrub_chunk_max")
97-
));
91+
auto [_, next] = co_await pg.backend->list_objects(
92+
begin,
93+
local_conf().get_val<int64_t>("osd_scrub_chunk_max"));
9894

9995
// We rely on seeing an entire set of snapshots in a single chunk
100-
auto end = next.hobj.get_max_object_boundary();
96+
auto end = next.get_max_object_boundary();
10197

102-
DEBUGDPP("got next.hobj: {}, returning begin, end: {}, {}",
103-
pg, next.hobj, begin, end);
98+
DEBUGDPP("got next: {}, returning begin, end: {}, {}",
99+
pg, next, begin, end);
104100
pg.scrubber.machine.process_event(
105101
scrub::ScrubContext::request_range_complete_t{begin, end});
106102
}

0 commit comments

Comments
 (0)