From: Samuel Just <sjust@redhat.com>
Date: Tue, 28 May 2024 20:36:45 +0000 (-0700)
Subject: crimson/.../snaptrim_event: no need to wait for activation
X-Git-Tag: v20.0.0~1716^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d4fc96b047b86ed7352c215e751f13f50de74a4a;p=ceph.git

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 99fe42d9a822..561d0a7cd928 100644
--- 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 6d5df1cca5d3..f389943b8332 100644
--- 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