crimson: remove now unused pipeline stages

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

diff --git a/src/crimson/osd/osd_operation.h b/src/crimson/osd/osd_operation.h
index 95675fdaad0c0a021d957a58d20f44e23b040277..2897a7e16237a1b28d1bff89eeda774636738fe8 100644 (file)
--- a/src/crimson/osd/osd_operation.h
+++ b/src/crimson/osd/osd_operation.h
@@ -50,24 +50,6 @@ struct PGPeeringPipeline {
 };
 
 struct CommonPGPipeline {
-  struct WaitForActive : OrderedExclusivePhaseT<WaitForActive> {
-    static constexpr auto type_name = "CommonPGPipeline:::wait_for_active";
-  } wait_for_active;
-  struct RecoverMissing : OrderedConcurrentPhaseT<RecoverMissing> {
-    static constexpr auto type_name = "CommonPGPipeline::recover_missing";
-  } recover_missing;
-  struct CheckAlreadyCompleteGetObc : OrderedExclusivePhaseT<CheckAlreadyCompleteGetObc> {
-    static constexpr auto type_name = "CommonPGPipeline::check_already_complete_get_obc";
-  } check_already_complete_get_obc;
-  struct LockOBC : OrderedConcurrentPhaseT<LockOBC> {
-    static constexpr auto type_name = "CommonPGPipeline::lock_obc";
-  } lock_obc;
-  struct Process : OrderedExclusivePhaseT<Process> {
-    static constexpr auto type_name = "CommonPGPipeline::process";
-  } process;
-  struct WaitRepop : OrderedConcurrentPhaseT<WaitRepop> {
-    static constexpr auto type_name = "ClientRequest::PGPipeline::wait_repop";
-  } wait_repop;
   struct WaitPGReady : OrderedConcurrentPhaseT<WaitPGReady> {
     static constexpr auto type_name = "CommonPGPipeline:::wait_pg_ready";
   } wait_pg_ready;

diff --git a/src/crimson/osd/osd_operation_external_tracking.h b/src/crimson/osd/osd_operation_external_tracking.h
index c15de31af3b71ffda2a3bc9bc7e1054af7b178c0..8dd17bb036d0d386bad65a65ad2f9a17ed93676d 100644 (file)
--- a/src/crimson/osd/osd_operation_external_tracking.h
+++ b/src/crimson/osd/osd_operation_external_tracking.h
@@ -30,21 +30,9 @@ struct LttngBackend
     CommonPGPipeline::GetOBC::BlockingEvent::Backend,
     OSD_OSDMapGate::OSDMapBlocker::BlockingEvent::Backend,
     PGMap::PGCreationBlockingEvent::Backend,
-    ClientRequest::PGPipeline::AwaitMap::BlockingEvent::Backend,
     PG_OSDMapGate::OSDMapBlocker::BlockingEvent::Backend,
-    ClientRequest::PGPipeline::WaitForActive::BlockingEvent::Backend,
     PGActivationBlocker::BlockingEvent::Backend,
     scrub::PGScrubber::BlockingEvent::Backend,
-    ClientRequest::PGPipeline::RecoverMissing::BlockingEvent::Backend,
-    ClientRequest::PGPipeline::RecoverMissing::
-      BlockingEvent::ExitBarrierEvent::Backend,
-    ClientRequest::PGPipeline::CheckAlreadyCompleteGetObc::BlockingEvent::Backend,
-    ClientRequest::PGPipeline::LockOBC::BlockingEvent::Backend,
-    ClientRequest::PGPipeline::LockOBC::BlockingEvent::ExitBarrierEvent::Backend,
-    ClientRequest::PGPipeline::Process::BlockingEvent::Backend,
-    ClientRequest::PGPipeline::WaitRepop::BlockingEvent::Backend,
-    ClientRequest::PGPipeline::WaitRepop::BlockingEvent::ExitBarrierEvent::Backend,
-    ClientRequest::PGPipeline::SendReply::BlockingEvent::Backend,
     ClientRequest::CompletionEvent::Backend,
     CommonOBCPipeline::Process::BlockingEvent::Backend,
     CommonOBCPipeline::WaitRepop::BlockingEvent::Backend,
@@ -99,21 +87,11 @@ struct LttngBackend
               const PGMap::PGCreationBlocker&) override {
   }
 
-  void handle(ClientRequest::PGPipeline::AwaitMap::BlockingEvent& ev,
-              const Operation& op,
-              const ClientRequest::PGPipeline::AwaitMap& blocker) override {
-  }
-
   void handle(PG_OSDMapGate::OSDMapBlocker::BlockingEvent&,
               const Operation&,
               const PG_OSDMapGate::OSDMapBlocker&) override {
   }
 
-  void handle(ClientRequest::PGPipeline::WaitForActive::BlockingEvent& ev,
-              const Operation& op,
-              const ClientRequest::PGPipeline::WaitForActive& blocker) override {
-  }
-
   void handle(PGActivationBlocker::BlockingEvent& ev,
               const Operation& op,
               const PGActivationBlocker& blocker) override {
@@ -124,49 +102,6 @@ struct LttngBackend
               const scrub::PGScrubber& blocker) override {
   }
 
-  void handle(ClientRequest::PGPipeline::RecoverMissing::BlockingEvent& ev,
-              const Operation& op,
-              const ClientRequest::PGPipeline::RecoverMissing& blocker) override {
-  }
-
-  void handle(ClientRequest::PGPipeline::RecoverMissing::BlockingEvent::ExitBarrierEvent& ev,
-             const Operation& op) override {
-  }
-
-  void handle(ClientRequest::PGPipeline::CheckAlreadyCompleteGetObc::BlockingEvent& ev,
-              const Operation& op,
-              const ClientRequest::PGPipeline::CheckAlreadyCompleteGetObc& blocker) override {
-  }
-
-
-  void handle(ClientRequest::PGPipeline::LockOBC::BlockingEvent& ev,
-              const Operation& op,
-              const ClientRequest::PGPipeline::LockOBC& blocker) override {
-  }
-
-  void handle(ClientRequest::PGPipeline::LockOBC::BlockingEvent::ExitBarrierEvent& ev,
-              const Operation& op) override {
-  }
-
-  void handle(ClientRequest::PGPipeline::Process::BlockingEvent& ev,
-              const Operation& op,
-              const ClientRequest::PGPipeline::Process& blocker) override {
-  }
-
-  void handle(ClientRequest::PGPipeline::WaitRepop::BlockingEvent& ev,
-              const Operation& op,
-              const ClientRequest::PGPipeline::WaitRepop& blocker) override {
-  }
-
-  void handle(ClientRequest::PGPipeline::WaitRepop::BlockingEvent::ExitBarrierEvent& ev,
-              const Operation& op) override {
-  }
-
-  void handle(ClientRequest::PGPipeline::SendReply::BlockingEvent& ev,
-              const Operation& op,
-              const ClientRequest::PGPipeline::SendReply& blocker) override {
-  }
-
   void handle(CommonOBCPipeline::Process::BlockingEvent& ev,
               const Operation& op,
               const CommonOBCPipeline::Process& blocker) override {
@@ -207,21 +142,9 @@ struct HistoricBackend
     CommonPGPipeline::GetOBC::BlockingEvent::Backend,
     OSD_OSDMapGate::OSDMapBlocker::BlockingEvent::Backend,
     PGMap::PGCreationBlockingEvent::Backend,
-    ClientRequest::PGPipeline::AwaitMap::BlockingEvent::Backend,
     PG_OSDMapGate::OSDMapBlocker::BlockingEvent::Backend,
-    ClientRequest::PGPipeline::WaitForActive::BlockingEvent::Backend,
     PGActivationBlocker::BlockingEvent::Backend,
     scrub::PGScrubber::BlockingEvent::Backend,
-    ClientRequest::PGPipeline::RecoverMissing::BlockingEvent::Backend,
-    ClientRequest::PGPipeline::RecoverMissing::
-      BlockingEvent::ExitBarrierEvent::Backend,
-    ClientRequest::PGPipeline::CheckAlreadyCompleteGetObc::BlockingEvent::Backend,
-    ClientRequest::PGPipeline::LockOBC::BlockingEvent::Backend,
-    ClientRequest::PGPipeline::LockOBC::BlockingEvent::ExitBarrierEvent::Backend,
-    ClientRequest::PGPipeline::Process::BlockingEvent::Backend,
-    ClientRequest::PGPipeline::WaitRepop::BlockingEvent::Backend,
-    ClientRequest::PGPipeline::WaitRepop::BlockingEvent::ExitBarrierEvent::Backend,
-    ClientRequest::PGPipeline::SendReply::BlockingEvent::Backend,
     ClientRequest::CompletionEvent::Backend,
     CommonOBCPipeline::Process::BlockingEvent::Backend,
     CommonOBCPipeline::WaitRepop::BlockingEvent::Backend,
@@ -276,21 +199,11 @@ struct HistoricBackend
               const PGMap::PGCreationBlocker&) override {
   }
 
-  void handle(ClientRequest::PGPipeline::AwaitMap::BlockingEvent& ev,
-              const Operation& op,
-              const ClientRequest::PGPipeline::AwaitMap& blocker) override {
-  }
-
   void handle(PG_OSDMapGate::OSDMapBlocker::BlockingEvent&,
               const Operation&,
               const PG_OSDMapGate::OSDMapBlocker&) override {
   }
 
-  void handle(ClientRequest::PGPipeline::WaitForActive::BlockingEvent& ev,
-              const Operation& op,
-              const ClientRequest::PGPipeline::WaitForActive& blocker) override {
-  }
-
   void handle(PGActivationBlocker::BlockingEvent& ev,
               const Operation& op,
               const PGActivationBlocker& blocker) override {
@@ -301,48 +214,6 @@ struct HistoricBackend
               const scrub::PGScrubber& blocker) override {
   }
 
-  void handle(ClientRequest::PGPipeline::RecoverMissing::BlockingEvent& ev,
-              const Operation& op,
-              const ClientRequest::PGPipeline::RecoverMissing& blocker) override {
-  }
-
-  void handle(ClientRequest::PGPipeline::RecoverMissing::BlockingEvent::ExitBarrierEvent& ev,
-              const Operation& op) override {
-  }
-
-  void handle(ClientRequest::PGPipeline::CheckAlreadyCompleteGetObc::BlockingEvent& ev,
-              const Operation& op,
-              const ClientRequest::PGPipeline::CheckAlreadyCompleteGetObc& blocker) override {
-  }
-
-  void handle(ClientRequest::PGPipeline::LockOBC::BlockingEvent& ev,
-              const Operation& op,
-              const ClientRequest::PGPipeline::LockOBC& blocker) override {
-  }
-
-  void handle(ClientRequest::PGPipeline::LockOBC::BlockingEvent::ExitBarrierEvent& ev,
-              const Operation& op) override {
-  }
-
-  void handle(ClientRequest::PGPipeline::Process::BlockingEvent& ev,
-              const Operation& op,
-              const ClientRequest::PGPipeline::Process& blocker) override {
-  }
-
-  void handle(ClientRequest::PGPipeline::WaitRepop::BlockingEvent& ev,
-              const Operation& op,
-              const ClientRequest::PGPipeline::WaitRepop& blocker) override {
-  }
-
-  void handle(ClientRequest::PGPipeline::WaitRepop::BlockingEvent::ExitBarrierEvent& ev,
-              const Operation& op) override {
-  }
-
-  void handle(ClientRequest::PGPipeline::SendReply::BlockingEvent& ev,
-              const Operation& op,
-              const ClientRequest::PGPipeline::SendReply& blocker) override {
-  }
-
   static const ClientRequest& to_client_request(const Operation& op) {
 #ifdef NDEBUG
     return static_cast<const ClientRequest&>(op);

diff --git a/src/crimson/osd/osd_operations/client_request.h b/src/crimson/osd/osd_operations/client_request.h
index bbf4ed33e451a6ecea6c07634a5a7d3a01c37b16..98443bdfc0f73a213862a52abe8254970f61da55 100644 (file)
--- a/src/crimson/osd/osd_operations/client_request.h
+++ b/src/crimson/osd/osd_operations/client_request.h
@@ -42,22 +42,6 @@ class ClientRequest final : public PhasedOperationT<ClientRequest>,
   unsigned instance_id = 0;
 
 public:
-  class PGPipeline : public CommonPGPipeline {
-    public:
-    struct AwaitMap : OrderedExclusivePhaseT<AwaitMap> {
-      static constexpr auto type_name = "ClientRequest::PGPipeline::await_map";
-    } await_map;
-    struct SendReply : OrderedExclusivePhaseT<SendReply> {
-      static constexpr auto type_name = "ClientRequest::PGPipeline::send_reply";
-    } send_reply;
-    friend class ClientRequest;
-    friend class LttngBackend;
-    friend class HistoricBackend;
-    friend class ReqRequest;
-    friend class LogMissingRequest;
-    friend class LogMissingRequestReply;
-  };
-
   /**
    * instance_handle_t
    *

diff --git a/src/crimson/osd/osd_operations/logmissing_request_reply.cc b/src/crimson/osd/osd_operations/logmissing_request_reply.cc
index fb122a95cd1421fa86bdbdae09be0dd96ad65142..5640610bd01dffad46167ea3be31e46d402420fe 100644 (file)
--- a/src/crimson/osd/osd_operations/logmissing_request_reply.cc
+++ b/src/crimson/osd/osd_operations/logmissing_request_reply.cc
@@ -56,11 +56,6 @@ PerShardPipeline &LogMissingRequestReply::get_pershard_pipeline(
   return shard_services.get_replicated_request_pipeline();
 }
 
-ClientRequest::PGPipeline &LogMissingRequestReply::client_pp(PG &pg)
-{
-  return pg.request_pg_pipeline;
-}
-
 seastar::future<> LogMissingRequestReply::with_pg(
   ShardServices &shard_services, Ref<PG> pg)
 {

diff --git a/src/crimson/osd/osd_operations/logmissing_request_reply.h b/src/crimson/osd/osd_operations/logmissing_request_reply.h
index c741b41bd0f5730e63eafdd83272eeed7cda1acf..71651d16789bc8e0bf1076d357569b3442756e82 100644 (file)
--- a/src/crimson/osd/osd_operations/logmissing_request_reply.h
+++ b/src/crimson/osd/osd_operations/logmissing_request_reply.h
@@ -82,8 +82,6 @@ public:
   > tracking_events;
 
 private:
-  ClientRequest::PGPipeline &client_pp(PG &pg);
-
   crimson::net::ConnectionRef l_conn;
   crimson::net::ConnectionXcoreRef r_conn;
 

diff --git a/src/crimson/osd/pg.h b/src/crimson/osd/pg.h
index bfc60299b8a35d79021e6894af2ff122f8afef53..f262ce4346e2e5b2802051b3cb1aef3ffa44d8f3 100644 (file)
--- a/src/crimson/osd/pg.h
+++ b/src/crimson/osd/pg.h
@@ -77,7 +77,7 @@ class PG : public boost::intrusive_ref_counter<
   using ec_profile_t = std::map<std::string,std::string>;
   using cached_map_t = OSDMapService::cached_map_t;
 
-  ClientRequest::PGPipeline request_pg_pipeline;
+  CommonPGPipeline request_pg_pipeline;
   PGRepopPipeline repop_pipeline;
   PGPeeringPipeline peering_request_pg_pipeline;