crimson/osd/osd_operations: Rename client_request_pg_pipeline

Rename client_request_pg_pipeline to request_pg_pipeline

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

diff --git a/src/crimson/osd/osd_operations/client_request.cc b/src/crimson/osd/osd_operations/client_request.cc
index 8919637f1579957ce04d37cfea22e680faa7e85a..8df95185ed362008260ea2e46def5135171bb49b 100644 (file)
--- 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 cf887f351aa9ec09e6aa1a19810989875c66b7a1..a1f2331770919bba439c17cdcb47ec085c5dbc9f 100644 (file)
--- 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 d858fa14b396e83463f8e895a31ce7fb8f656695..eb89acdd00e6e5c51801121e882e46c465e6088d 100644 (file)
--- 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 2218e3053c086a420c384cb087986bdb5b1300f6..95a968c1455d2d737df454372adcdc1012517de2 100644 (file)
--- 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 7beed1011bcad0fa255c39e6745f5e13f21911e1..5dc572d52e2666bbb121444529d7deb44ff435a5 100644 (file)
--- 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 63d55d2aa5f022437effb7277bf52b9b681445da..6727b7dda69e73d20b31ced550af2df3d7f2b9e0 100644 (file)
--- 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<std::string,std::string>;
   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 8db67d356bbd99d70a3999bda71a2283eb8e585a..0ff4ad5730f5b481bd73b89e98caf56ab06baba2 100644 (file)
--- 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:-)