From e14142894922b403344d7f08315b67a291b9a27a Mon Sep 17 00:00:00 2001 From: Matan Breizman Date: Wed, 1 Feb 2023 13:43:09 +0000 Subject: [PATCH] crimson/osd/osd_operations: Remove replicated_request_pg_pipeline Use client_request_pg_pipeline instead. Signed-off-by: Matan Breizman --- src/crimson/osd/osd_operations/client_request.h | 3 +++ .../osd/osd_operations/logmissing_request.cc | 4 ++-- src/crimson/osd/osd_operations/logmissing_request.h | 13 ++----------- .../osd/osd_operations/logmissing_request_reply.cc | 4 ++-- .../osd/osd_operations/logmissing_request_reply.h | 13 ++----------- .../osd/osd_operations/replicated_request.cc | 4 ++-- src/crimson/osd/osd_operations/replicated_request.h | 12 ++---------- src/crimson/osd/pg.h | 1 - 8 files changed, 15 insertions(+), 39 deletions(-) diff --git a/src/crimson/osd/osd_operations/client_request.h b/src/crimson/osd/osd_operations/client_request.h index 1646a050a17..c64e8b97528 100644 --- a/src/crimson/osd/osd_operations/client_request.h +++ b/src/crimson/osd/osd_operations/client_request.h @@ -53,6 +53,9 @@ public: friend class ClientRequest; friend class LttngBackend; friend class HistoricBackend; + friend class ReqRequest; + friend class LogMissingRequest; + friend class LogMissingRequestReply; }; /** diff --git a/src/crimson/osd/osd_operations/logmissing_request.cc b/src/crimson/osd/osd_operations/logmissing_request.cc index 0b6df5a37c8..d858fa14b39 100644 --- a/src/crimson/osd/osd_operations/logmissing_request.cc +++ b/src/crimson/osd/osd_operations/logmissing_request.cc @@ -49,9 +49,9 @@ ConnectionPipeline &LogMissingRequest::get_connection_pipeline() return get_osd_priv(conn.get()).replicated_request_conn_pipeline; } -RepRequest::PGPipeline &LogMissingRequest::pp(PG &pg) +ClientRequest::PGPipeline &LogMissingRequest::pp(PG &pg) { - return pg.replicated_request_pg_pipeline; + return pg.client_request_pg_pipeline; } seastar::future<> LogMissingRequest::with_pg( diff --git a/src/crimson/osd/osd_operations/logmissing_request.h b/src/crimson/osd/osd_operations/logmissing_request.h index e05868a9648..ab9da197db7 100644 --- a/src/crimson/osd/osd_operations/logmissing_request.h +++ b/src/crimson/osd/osd_operations/logmissing_request.h @@ -6,7 +6,7 @@ #include "crimson/net/Connection.h" #include "crimson/osd/osdmap_gate.h" #include "crimson/osd/osd_operation.h" -#include "crimson/osd/osd_operations/replicated_request.h" +#include "crimson/osd/osd_operations/client_request.h" #include "crimson/osd/pg_map.h" #include "crimson/common/type_helpers.h" #include "messages/MOSDPGUpdateLogMissing.h" @@ -24,15 +24,6 @@ class PG; class LogMissingRequest final : public PhasedOperationT { public: - class PGPipeline { - struct AwaitMap : OrderedExclusivePhaseT { - static constexpr auto type_name = "LogMissingRequest::PGPipeline::await_map"; - } await_map; - struct Process : OrderedExclusivePhaseT { - static constexpr auto type_name = "LogMissingRequest::PGPipeline::process"; - } process; - friend LogMissingRequest; - }; static constexpr OperationTypeCode type = OperationTypeCode::logmissing_request; LogMissingRequest(crimson::net::ConnectionRef&&, Ref&&); @@ -59,7 +50,7 @@ public: > tracking_events; private: - RepRequest::PGPipeline &pp(PG &pg); + ClientRequest::PGPipeline &pp(PG &pg); crimson::net::ConnectionFRef conn; // must be after `conn` to ensure the ConnectionPipeline's is alive diff --git a/src/crimson/osd/osd_operations/logmissing_request_reply.cc b/src/crimson/osd/osd_operations/logmissing_request_reply.cc index 6233bf50eb5..2218e3053c0 100644 --- a/src/crimson/osd/osd_operations/logmissing_request_reply.cc +++ b/src/crimson/osd/osd_operations/logmissing_request_reply.cc @@ -49,9 +49,9 @@ ConnectionPipeline &LogMissingRequestReply::get_connection_pipeline() return get_osd_priv(conn.get()).replicated_request_conn_pipeline; } -RepRequest::PGPipeline &LogMissingRequestReply::pp(PG &pg) +ClientRequest::PGPipeline &LogMissingRequestReply::pp(PG &pg) { - return pg.replicated_request_pg_pipeline; + return pg.client_request_pg_pipeline; } seastar::future<> LogMissingRequestReply::with_pg( diff --git a/src/crimson/osd/osd_operations/logmissing_request_reply.h b/src/crimson/osd/osd_operations/logmissing_request_reply.h index 9d307987158..e84d8a521f5 100644 --- a/src/crimson/osd/osd_operations/logmissing_request_reply.h +++ b/src/crimson/osd/osd_operations/logmissing_request_reply.h @@ -6,7 +6,7 @@ #include "crimson/net/Connection.h" #include "crimson/osd/osdmap_gate.h" #include "crimson/osd/osd_operation.h" -#include "crimson/osd/osd_operations/replicated_request.h" +#include "crimson/osd/osd_operations/client_request.h" #include "crimson/osd/pg_map.h" #include "crimson/common/type_helpers.h" #include "messages/MOSDPGUpdateLogMissingReply.h" @@ -24,15 +24,6 @@ class PG; class LogMissingRequestReply final : public PhasedOperationT { public: - class PGPipeline { - struct AwaitMap : OrderedExclusivePhaseT { - static constexpr auto type_name = "LogMissingRequestReply::PGPipeline::await_map"; - } await_map; - struct Process : OrderedExclusivePhaseT { - static constexpr auto type_name = "LogMissingRequestReply::PGPipeline::process"; - } process; - friend LogMissingRequestReply; - }; static constexpr OperationTypeCode type = OperationTypeCode::logmissing_request_reply; LogMissingRequestReply(crimson::net::ConnectionRef&&, Ref&&); @@ -59,7 +50,7 @@ public: > tracking_events; private: - RepRequest::PGPipeline &pp(PG &pg); + ClientRequest::PGPipeline &pp(PG &pg); crimson::net::ConnectionFRef conn; // must be after `conn` to ensure the ConnectionPipeline's is alive diff --git a/src/crimson/osd/osd_operations/replicated_request.cc b/src/crimson/osd/osd_operations/replicated_request.cc index ac197d8ae7c..7beed1011bc 100644 --- a/src/crimson/osd/osd_operations/replicated_request.cc +++ b/src/crimson/osd/osd_operations/replicated_request.cc @@ -49,9 +49,9 @@ ConnectionPipeline &RepRequest::get_connection_pipeline() return get_osd_priv(conn.get()).replicated_request_conn_pipeline; } -RepRequest::PGPipeline &RepRequest::pp(PG &pg) +ClientRequest::PGPipeline &RepRequest::pp(PG &pg) { - return pg.replicated_request_pg_pipeline; + return pg.client_request_pg_pipeline; } seastar::future<> RepRequest::with_pg( diff --git a/src/crimson/osd/osd_operations/replicated_request.h b/src/crimson/osd/osd_operations/replicated_request.h index 467a581c6db..4b1aa9944d1 100644 --- a/src/crimson/osd/osd_operations/replicated_request.h +++ b/src/crimson/osd/osd_operations/replicated_request.h @@ -7,6 +7,7 @@ #include "crimson/osd/osdmap_gate.h" #include "crimson/osd/osd_operation.h" #include "crimson/osd/pg_map.h" +#include "crimson/osd/osd_operations/client_request.h" #include "crimson/common/type_helpers.h" #include "messages/MOSDRepOp.h" @@ -23,15 +24,6 @@ class PG; class RepRequest final : public PhasedOperationT { public: - class PGPipeline { - struct AwaitMap : OrderedExclusivePhaseT { - static constexpr auto type_name = "RepRequest::PGPipeline::await_map"; - } await_map; - struct Process : OrderedExclusivePhaseT { - static constexpr auto type_name = "RepRequest::PGPipeline::process"; - } process; - friend RepRequest; - }; static constexpr OperationTypeCode type = OperationTypeCode::replicated_request; RepRequest(crimson::net::ConnectionRef&&, Ref&&); @@ -58,7 +50,7 @@ public: > tracking_events; private: - PGPipeline &pp(PG &pg); + ClientRequest::PGPipeline &pp(PG &pg); crimson::net::ConnectionFRef conn; PipelineHandle handle; diff --git a/src/crimson/osd/pg.h b/src/crimson/osd/pg.h index a1b0a70ccd1..63d55d2aa5f 100644 --- a/src/crimson/osd/pg.h +++ b/src/crimson/osd/pg.h @@ -71,7 +71,6 @@ class PG : public boost::intrusive_ref_counter< ClientRequest::PGPipeline client_request_pg_pipeline; PGPeeringPipeline peering_request_pg_pipeline; - RepRequest::PGPipeline replicated_request_pg_pipeline; ClientRequest::Orderer client_request_orderer; -- 2.39.5