From 5ec417eeda8d5077ec8db8201cd6f87ef1a2e2b7 Mon Sep 17 00:00:00 2001 From: Xuehan Xu Date: Thu, 6 Jun 2024 11:55:38 +0800 Subject: [PATCH] crimson/osd/osd_operations: correct connection pipelines for osd operations Fixes: https://tracker.ceph.com/issues/66374 Signed-off-by: Xuehan Xu (cherry picked from commit cb379bbdb7526c8858f64e035a676e23a82770a6) --- src/crimson/osd/osd_operations/logmissing_request.cc | 2 +- src/crimson/osd/osd_operations/peering_event.cc | 2 +- src/crimson/osd/osd_operations/recovery_subrequest.cc | 2 +- src/crimson/osd/osd_operations/replicated_request.cc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/crimson/osd/osd_operations/logmissing_request.cc b/src/crimson/osd/osd_operations/logmissing_request.cc index 7e979131f0604..cc3448fb1ce2e 100644 --- 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 index 5c5c73e008676..6c1afd3d3360f 100644 --- a/src/crimson/osd/osd_operations/peering_event.cc +++ b/src/crimson/osd/osd_operations/peering_event.cc @@ -136,7 +136,7 @@ PeeringEvent::complete_rctx(ShardServices &shard_services, Ref 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 index 06a3be1662c26..e333e4b5c0afd 100644 --- 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 index dc2adc37efefb..30adde0445ad5 100644 --- 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( -- 2.39.5