From: Samuel Just <sjust@redhat.com>
Date: Wed, 27 Mar 2024 01:43:06 +0000 (+0000)
Subject: crimson/.../scrub_events: use PGBackend::list_objects in ScrubFindRange::run
X-Git-Tag: testing/wip-batrick-testing-20240411.154038~99^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9f39124f33e878e321b330e58e97efc0a1cf1242;p=ceph-ci.git

crimson/.../scrub_events: use PGBackend::list_objects in ScrubFindRange::run

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/crimson/osd/osd_operations/scrub_events.cc b/src/crimson/osd/osd_operations/scrub_events.cc
index feffce8c05f..e62cdde0fba 100644
--- a/src/crimson/osd/osd_operations/scrub_events.cc
+++ b/src/crimson/osd/osd_operations/scrub_events.cc
@@ -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});
 }