]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/.../scrub_events: use PGBackend::list_objects in ScrubScan::run 56534/head
authorSamuel Just <sjust@redhat.com>
Tue, 26 Mar 2024 06:17:10 +0000 (23:17 -0700)
committerSamuel Just <sjust@redhat.com>
Wed, 27 Mar 2024 02:36:55 +0000 (02:36 +0000)
Fixes: https://tracker.ceph.com/issues/64975
Signed-off-by: Samuel Just <sjust@redhat.com>
src/crimson/osd/osd_operations/scrub_events.cc

index 1d109db4851cbe3a65c3664232d14528c021c124..0ee6d6809f64d3f55abfd49dbb69cfaae6e7adac 100644 (file)
@@ -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<uint64_t>::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) {