]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/.../scrub_events: use PGBackend::list_objects in ScrubFindRange::run
authorSamuel Just <sjust@redhat.com>
Wed, 27 Mar 2024 01:43:06 +0000 (01:43 +0000)
committerSamuel Just <sjust@redhat.com>
Wed, 27 Mar 2024 02:36:54 +0000 (02:36 +0000)
Signed-off-by: Samuel Just <sjust@redhat.com>
src/crimson/osd/osd_operations/scrub_events.cc

index feffce8c05f0f407ae469e6c9b14c9bf554ef332..e62cdde0fbab2bfa371e216c8f4626477d9709f3 100644 (file)
@@ -88,19 +88,15 @@ ScrubFindRange::ifut<> ScrubFindRange::run(PG &pg)
 {
   LOG_PREFIX(ScrubFindRange::run);
   using crimson::common::local_conf;
-  auto [_, next] = 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::get_max(),
-      local_conf().get_val<int64_t>("osd_scrub_chunk_max")
-    ));
+  auto [_, next] = co_await pg.backend->list_objects(
+    begin,
+    local_conf().get_val<int64_t>("osd_scrub_chunk_max"));
 
   // We rely on seeing an entire set of snapshots in a single chunk
-  auto end = next.hobj.get_max_object_boundary();
+  auto end = next.get_max_object_boundary();
 
-  DEBUGDPP("got next.hobj: {}, returning begin, end: {}, {}",
-          pg, next.hobj, begin, end);
+  DEBUGDPP("got next: {}, returning begin, end: {}, {}",
+          pg, next, begin, end);
   pg.scrubber.machine.process_event(
     scrub::ScrubContext::request_range_complete_t{begin, end});
 }