From 64210532033ff2398006e59f33923d05d1ca6378 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Wed, 27 Nov 2024 01:49:08 +0000 Subject: [PATCH] crimson/.../osd_operation*: add wait_pg_ready and get_obc Signed-off-by: Samuel Just --- src/crimson/osd/osd_operation.h | 6 ++++ .../osd/osd_operation_external_tracking.h | 34 +++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/src/crimson/osd/osd_operation.h b/src/crimson/osd/osd_operation.h index 82fb816ab03..43765815bdd 100644 --- a/src/crimson/osd/osd_operation.h +++ b/src/crimson/osd/osd_operation.h @@ -68,6 +68,12 @@ struct CommonPGPipeline { struct WaitRepop : OrderedConcurrentPhaseT { static constexpr auto type_name = "ClientRequest::PGPipeline::wait_repop"; } wait_repop; + struct WaitPGReady : OrderedConcurrentPhaseT { + static constexpr auto type_name = "CommonPGPipeline:::wait_pg_ready"; + } wait_pg_ready; + struct GetOBC : OrderedExclusivePhaseT { + static constexpr auto type_name = "CommonPGPipeline:::get_obc"; + } get_obc; }; struct CommonOBCPipeline { diff --git a/src/crimson/osd/osd_operation_external_tracking.h b/src/crimson/osd/osd_operation_external_tracking.h index 6956f5661c6..dec2e89fc22 100644 --- a/src/crimson/osd/osd_operation_external_tracking.h +++ b/src/crimson/osd/osd_operation_external_tracking.h @@ -25,6 +25,9 @@ struct LttngBackend ConnectionPipeline::AwaitMap::BlockingEvent::Backend, ConnectionPipeline::GetPGMapping::BlockingEvent::Backend, PerShardPipeline::CreateOrWaitPG::BlockingEvent::Backend, + CommonPGPipeline::WaitPGReady::BlockingEvent::Backend, + CommonPGPipeline::WaitPGReady::BlockingEvent::ExitBarrierEvent::Backend, + CommonPGPipeline::GetOBC::BlockingEvent::Backend, OSD_OSDMapGate::OSDMapBlocker::BlockingEvent::Backend, PGMap::PGCreationBlockingEvent::Backend, ClientRequest::PGPipeline::AwaitMap::BlockingEvent::Backend, @@ -76,6 +79,20 @@ struct LttngBackend const PerShardPipeline::CreateOrWaitPG& blocker) override { } + void handle(CommonPGPipeline::WaitPGReady::BlockingEvent& ev, + const Operation& op, + const CommonPGPipeline::WaitPGReady& blocker) override { + } + + void handle(CommonPGPipeline::WaitPGReady::BlockingEvent::ExitBarrierEvent& ev, + const Operation& op) override { + } + + void handle(CommonPGPipeline::GetOBC::BlockingEvent& ev, + const Operation& op, + const CommonPGPipeline::GetOBC& blocker) override { + } + void handle(PGMap::PGCreationBlockingEvent&, const Operation&, const PGMap::PGCreationBlocker&) override { @@ -180,6 +197,9 @@ struct HistoricBackend ConnectionPipeline::AwaitMap::BlockingEvent::Backend, ConnectionPipeline::GetPGMapping::BlockingEvent::Backend, PerShardPipeline::CreateOrWaitPG::BlockingEvent::Backend, + CommonPGPipeline::WaitPGReady::BlockingEvent::Backend, + CommonPGPipeline::WaitPGReady::BlockingEvent::ExitBarrierEvent::Backend, + CommonPGPipeline::GetOBC::BlockingEvent::Backend, OSD_OSDMapGate::OSDMapBlocker::BlockingEvent::Backend, PGMap::PGCreationBlockingEvent::Backend, ClientRequest::PGPipeline::AwaitMap::BlockingEvent::Backend, @@ -231,6 +251,20 @@ struct HistoricBackend const PerShardPipeline::CreateOrWaitPG& blocker) override { } + void handle(CommonPGPipeline::WaitPGReady::BlockingEvent& ev, + const Operation& op, + const CommonPGPipeline::WaitPGReady& blocker) override { + } + + void handle(CommonPGPipeline::WaitPGReady::BlockingEvent::ExitBarrierEvent& ev, + const Operation& op) override { + } + + void handle(CommonPGPipeline::GetOBC::BlockingEvent& ev, + const Operation& op, + const CommonPGPipeline::GetOBC& blocker) override { + } + void handle(PGMap::PGCreationBlockingEvent&, const Operation&, const PGMap::PGCreationBlocker&) override { -- 2.39.5