Merge pull request ceph#57908 from xxhdx1985126/wip-66374

Matan-B · web-flow · commit 8b419ce15682 · 2024-06-09T17:51:07.000+03:00
crimson/osd/osd_operations: correct connection pipelines for osd operations

Reviewed-by: Samuel Just &lt;sjust@redhat.com&gt;
Reviewed-by: Yingxin Cheng &lt;yingxin.cheng@intel.com&gt;
diff --git a/src/crimson/osd/osd_operations/logmissing_request.cc b/src/crimson/osd/osd_operations/logmissing_request.cc
@@ -49,7 +49,7 @@ void LogMissingRequest::dump_detail(Formatter *f) const
 ConnectionPipeline &LogMissingRequest::get_connection_pipeline()
 {
   return get_osd_priv(&get_local_connection()
-         ).client_request_conn_pipeline;
+         ).replicated_request_conn_pipeline;
 }
 
 PerShardPipeline &LogMissingRequest::get_pershard_pipeline(
diff --git a/src/crimson/osd/osd_operations/peering_event.cc b/src/crimson/osd/osd_operations/peering_event.cc
@@ -136,7 +136,7 @@ PeeringEvent<T>::complete_rctx(ShardServices &shard_services, Ref<PG> pg)
 ConnectionPipeline &RemotePeeringEvent::get_connection_pipeline()
 {
   return get_osd_priv(&get_local_connection()
-         ).client_request_conn_pipeline;
+         ).peering_request_conn_pipeline;
 }
 
 PerShardPipeline &RemotePeeringEvent::get_pershard_pipeline(
diff --git a/src/crimson/osd/osd_operations/recovery_subrequest.cc b/src/crimson/osd/osd_operations/recovery_subrequest.cc
@@ -53,7 +53,7 @@ seastar::future<> RecoverySubRequest::with_pg(
 ConnectionPipeline &RecoverySubRequest::get_connection_pipeline()
 {
   return get_osd_priv(&get_local_connection()
-         ).client_request_conn_pipeline;
+         ).peering_request_conn_pipeline;
 }
 
 PerShardPipeline &RecoverySubRequest::get_pershard_pipeline(
diff --git a/src/crimson/osd/osd_operations/replicated_request.cc b/src/crimson/osd/osd_operations/replicated_request.cc
@@ -49,7 +49,7 @@ void RepRequest::dump_detail(Formatter *f) const
 ConnectionPipeline &RepRequest::get_connection_pipeline()
 {
   return get_osd_priv(&get_local_connection()
-         ).client_request_conn_pipeline;
+         ).replicated_request_conn_pipeline;
 }
 
 PerShardPipeline &RepRequest::get_pershard_pipeline(

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ void LogMissingRequest::dump_detail(Formatter *f) const`
`49`	`49`	`ConnectionPipeline &LogMissingRequest::get_connection_pipeline()`
`50`	`50`	`{`
`51`	`51`	`return get_osd_priv(&get_local_connection()`
`52`		`- ).client_request_conn_pipeline;`
	`52`	`+ ).replicated_request_conn_pipeline;`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`PerShardPipeline &LogMissingRequest::get_pershard_pipeline(`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ PeeringEvent<T>::complete_rctx(ShardServices &shard_services, Ref<PG> pg)`
`136`	`136`	`ConnectionPipeline &RemotePeeringEvent::get_connection_pipeline()`
`137`	`137`	`{`
`138`	`138`	`return get_osd_priv(&get_local_connection()`
`139`		`- ).client_request_conn_pipeline;`
	`139`	`+ ).peering_request_conn_pipeline;`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`PerShardPipeline &RemotePeeringEvent::get_pershard_pipeline(`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ seastar::future<> RecoverySubRequest::with_pg(`
`53`	`53`	`ConnectionPipeline &RecoverySubRequest::get_connection_pipeline()`
`54`	`54`	`{`
`55`	`55`	`return get_osd_priv(&get_local_connection()`
`56`		`- ).client_request_conn_pipeline;`
	`56`	`+ ).peering_request_conn_pipeline;`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`PerShardPipeline &RecoverySubRequest::get_pershard_pipeline(`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ void RepRequest::dump_detail(Formatter *f) const`
`49`	`49`	`ConnectionPipeline &RepRequest::get_connection_pipeline()`
`50`	`50`	`{`
`51`	`51`	`return get_osd_priv(&get_local_connection()`
`52`		`- ).client_request_conn_pipeline;`
	`52`	`+ ).replicated_request_conn_pipeline;`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`PerShardPipeline &RepRequest::get_pershard_pipeline(`