From 18296254322ac877ead017e7d9aafe35497a3ecb Mon Sep 17 00:00:00 2001 From: Yingxin Cheng Date: Mon, 3 Apr 2023 09:54:49 +0800 Subject: [PATCH] crimson/osd: drop unused methods in ClientRequest Signed-off-by: Yingxin Cheng (cherry picked from commit 1f419b779e8610a19bfa4141d12403c7271686cf) --- src/crimson/osd/osd_operations/client_request.cc | 11 ----------- src/crimson/osd/osd_operations/client_request.h | 5 ++--- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/crimson/osd/osd_operations/client_request.cc b/src/crimson/osd/osd_operations/client_request.cc index 57726603584..298eac501df 100644 --- a/src/crimson/osd/osd_operations/client_request.cc +++ b/src/crimson/osd/osd_operations/client_request.cc @@ -80,22 +80,11 @@ ConnectionPipeline &ClientRequest::get_connection_pipeline() return get_osd_priv(conn.get()).client_request_conn_pipeline; } -ConnectionPipeline &ClientRequest::cp() -{ - return get_osd_priv(conn.get()).client_request_conn_pipeline; -} - ClientRequest::PGPipeline &ClientRequest::pp(PG &pg) { return pg.request_pg_pipeline; } -bool ClientRequest::same_session_and_pg(const ClientRequest& other_op) const -{ - return &get_osd_priv(conn.get()) == &get_osd_priv(other_op.conn.get()) && - m->get_spg() == other_op.m->get_spg(); -} - bool ClientRequest::is_pg_op() const { return std::any_of( diff --git a/src/crimson/osd/osd_operations/client_request.h b/src/crimson/osd/osd_operations/client_request.h index a7d68fccf28..e7620b6af96 100644 --- a/src/crimson/osd/osd_operations/client_request.h +++ b/src/crimson/osd/osd_operations/client_request.h @@ -208,11 +208,11 @@ public: seastar::future<> with_pg_int( ShardServices &shard_services, Ref pg); -public: - bool same_session_and_pg(const ClientRequest& other_op) const; +public: seastar::future<> with_pg( ShardServices &shard_services, Ref pgref); + private: template interruptible_future<> with_sequencer(FuncT&& func); @@ -231,7 +231,6 @@ private: Ref &pg); bool is_pg_op() const; - ConnectionPipeline &cp(); PGPipeline &pp(PG &pg); template -- 2.39.5