crimson/.../snaptrim_event: no need to wait for activation

PG must already be active+clean.

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

diff --git a/src/crimson/osd/osd_operations/snaptrim_event.cc b/src/crimson/osd/osd_operations/snaptrim_event.cc
index 99fe42d9a822dce7c9d1f5b71528844e6e7c0177..561d0a7cd928c9d2757746a13dbb21182b7a3fc5 100644 (file)
--- a/src/crimson/osd/osd_operations/snaptrim_event.cc
+++ b/src/crimson/osd/osd_operations/snaptrim_event.cc
@@ -75,13 +75,6 @@ SnapTrimEvent::start()
   /* TODO: add a way to expose progress via the optracker without misusing
    * pipeline stages. https://tracker.ceph.com/issues/66473 */
   ShardServices &shard_services = pg->get_shard_services();
-  co_await enter_stage<interruptor>(client_pp().wait_for_active);
-
-  co_await with_blocking_event<PGActivationBlocker::BlockingEvent, interruptor>(
-    [this] (auto&& trigger) {
-      return pg->wait_for_active_blocker.wait(std::move(trigger));
-    });
-
   co_await enter_stage<interruptor>(
     client_pp().get_obc);
 
@@ -413,15 +406,6 @@ SnapTrimObjSubEvent::start()
     handle.exit();
   });
 
-  co_await enter_stage<interruptor>(
-    client_pp().wait_for_active
-  );
-
-  co_await with_blocking_event<PGActivationBlocker::BlockingEvent, interruptor>(
-    [this] (auto&& trigger) {
-      return pg->wait_for_active_blocker.wait(std::move(trigger));
-    });
-
   co_await enter_stage<interruptor>(
     client_pp().get_obc);
 

diff --git a/src/crimson/osd/osd_operations/snaptrim_event.h b/src/crimson/osd/osd_operations/snaptrim_event.h
index 6d5df1cca5d3823aeeb4c445764936a38e85eece..f389943b83329b62302c181319f59dd8e6773dff 100644 (file)
--- a/src/crimson/osd/osd_operations/snaptrim_event.h
+++ b/src/crimson/osd/osd_operations/snaptrim_event.h
@@ -72,8 +72,6 @@ public:
 
   std::tuple<
     StartEvent,
-    CommonPGPipeline::WaitForActive::BlockingEvent,
-    PGActivationBlocker::BlockingEvent,
     CommonPGPipeline::GetOBC::BlockingEvent,
     CommonPGPipeline::Process::BlockingEvent,
     PG::BackgroundProcessLock::Wait::BlockingEvent,
@@ -170,8 +168,6 @@ public:
 
   std::tuple<
     StartEvent,
-    CommonPGPipeline::WaitForActive::BlockingEvent,
-    PGActivationBlocker::BlockingEvent,
     CommonPGPipeline::GetOBC::BlockingEvent,
     CommonPGPipeline::Process::BlockingEvent,
     CompletionEvent