From f4d336a2dbf864fe798ca7f500d44576d3f626d5 Mon Sep 17 00:00:00 2001 From: Matan Breizman Date: Tue, 7 Feb 2023 11:16:07 +0000 Subject: [PATCH] crimson/osd/osd_operations: Rename client_request_pg_pipeline Rename client_request_pg_pipeline to request_pg_pipeline Signed-off-by: Matan Breizman --- src/crimson/osd/osd_operations/client_request.cc | 2 +- src/crimson/osd/osd_operations/internal_client_request.cc | 2 +- src/crimson/osd/osd_operations/logmissing_request.cc | 2 +- src/crimson/osd/osd_operations/logmissing_request_reply.cc | 2 +- src/crimson/osd/osd_operations/replicated_request.cc | 2 +- src/crimson/osd/pg.h | 2 +- src/crimson/osd/replicated_backend.cc | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/crimson/osd/osd_operations/client_request.cc b/src/crimson/osd/osd_operations/client_request.cc index 8919637f15799..8df95185ed362 100644 --- a/src/crimson/osd/osd_operations/client_request.cc +++ b/src/crimson/osd/osd_operations/client_request.cc @@ -87,7 +87,7 @@ ConnectionPipeline &ClientRequest::cp() ClientRequest::PGPipeline &ClientRequest::pp(PG &pg) { - return pg.client_request_pg_pipeline; + return pg.request_pg_pipeline; } bool ClientRequest::same_session_and_pg(const ClientRequest& other_op) const diff --git a/src/crimson/osd/osd_operations/internal_client_request.cc b/src/crimson/osd/osd_operations/internal_client_request.cc index cf887f351aa9e..a1f2331770919 100644 --- a/src/crimson/osd/osd_operations/internal_client_request.cc +++ b/src/crimson/osd/osd_operations/internal_client_request.cc @@ -44,7 +44,7 @@ void InternalClientRequest::dump_detail(Formatter *f) const CommonPGPipeline& InternalClientRequest::pp() { - return pg->client_request_pg_pipeline; + return pg->request_pg_pipeline; } seastar::future<> InternalClientRequest::start() diff --git a/src/crimson/osd/osd_operations/logmissing_request.cc b/src/crimson/osd/osd_operations/logmissing_request.cc index d858fa14b396e..eb89acdd00e6e 100644 --- a/src/crimson/osd/osd_operations/logmissing_request.cc +++ b/src/crimson/osd/osd_operations/logmissing_request.cc @@ -51,7 +51,7 @@ ConnectionPipeline &LogMissingRequest::get_connection_pipeline() ClientRequest::PGPipeline &LogMissingRequest::pp(PG &pg) { - return pg.client_request_pg_pipeline; + return pg.request_pg_pipeline; } seastar::future<> LogMissingRequest::with_pg( diff --git a/src/crimson/osd/osd_operations/logmissing_request_reply.cc b/src/crimson/osd/osd_operations/logmissing_request_reply.cc index 2218e3053c086..95a968c1455d2 100644 --- a/src/crimson/osd/osd_operations/logmissing_request_reply.cc +++ b/src/crimson/osd/osd_operations/logmissing_request_reply.cc @@ -51,7 +51,7 @@ ConnectionPipeline &LogMissingRequestReply::get_connection_pipeline() ClientRequest::PGPipeline &LogMissingRequestReply::pp(PG &pg) { - return pg.client_request_pg_pipeline; + return pg.request_pg_pipeline; } seastar::future<> LogMissingRequestReply::with_pg( diff --git a/src/crimson/osd/osd_operations/replicated_request.cc b/src/crimson/osd/osd_operations/replicated_request.cc index 7beed1011bcad..5dc572d52e266 100644 --- a/src/crimson/osd/osd_operations/replicated_request.cc +++ b/src/crimson/osd/osd_operations/replicated_request.cc @@ -51,7 +51,7 @@ ConnectionPipeline &RepRequest::get_connection_pipeline() ClientRequest::PGPipeline &RepRequest::pp(PG &pg) { - return pg.client_request_pg_pipeline; + return pg.request_pg_pipeline; } seastar::future<> RepRequest::with_pg( diff --git a/src/crimson/osd/pg.h b/src/crimson/osd/pg.h index 63d55d2aa5f02..6727b7dda69e7 100644 --- a/src/crimson/osd/pg.h +++ b/src/crimson/osd/pg.h @@ -69,7 +69,7 @@ class PG : public boost::intrusive_ref_counter< using ec_profile_t = std::map; using cached_map_t = OSDMapService::cached_map_t; - ClientRequest::PGPipeline client_request_pg_pipeline; + ClientRequest::PGPipeline request_pg_pipeline; PGPeeringPipeline peering_request_pg_pipeline; ClientRequest::Orderer client_request_orderer; diff --git a/src/crimson/osd/replicated_backend.cc b/src/crimson/osd/replicated_backend.cc index 8db67d356bbd9..0ff4ad5730f5b 100644 --- a/src/crimson/osd/replicated_backend.cc +++ b/src/crimson/osd/replicated_backend.cc @@ -161,7 +161,7 @@ ReplicatedBackend::request_committed(const osd_reqid_t& reqid, // // The following line of code should be "assert(pending_txn.at_version == at_version)", // as there can be only one transaction at any time in pending_trans due to - // PG::client_request_pg_pipeline. But there's a high possibility that we will + // PG::request_pg_pipeline. But there's a high possibility that we will // improve the parallelism here in the future, which means there may be multiple // client requests in flight, so we loosed the restriction to as follows. Correct // me if I'm wrong:-) -- 2.39.5