From 85563a617ee1a75134658fb9086c2fdc420d6468 Mon Sep 17 00:00:00 2001 From: Amnon Hanuhov Date: Tue, 8 Jun 2021 15:51:33 +0300 Subject: [PATCH] crimson/osd: Get rid of send_to_osd() overloading Signed-off-by: Amnon Hanuhov --- src/crimson/osd/pg.cc | 4 ++-- src/crimson/osd/shard_services.cc | 17 ++--------------- src/crimson/osd/shard_services.h | 7 ------- 3 files changed, 4 insertions(+), 24 deletions(-) diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc index 4d1445aa2bdca..066798417a488 100644 --- a/src/crimson/osd/pg.cc +++ b/src/crimson/osd/pg.cc @@ -1103,11 +1103,11 @@ PG::interruptible_future<> PG::handle_rep_op(Ref req) [req, lcod=peering_state.get_info().last_complete, this] { peering_state.update_last_complete_ondisk(lcod); const auto map_epoch = get_osdmap_epoch(); - auto reply = ceph::make_message( + auto reply = crimson::make_message( req.get(), pg_whoami, 0, map_epoch, req->get_min_epoch(), CEPH_OSD_FLAG_ONDISK); reply->set_last_complete_ondisk(lcod); - return shard_services.send_to_osd(req->from.osd, reply, map_epoch); + return shard_services.send_to_osd(req->from.osd, std::move(reply), map_epoch); }); } diff --git a/src/crimson/osd/shard_services.cc b/src/crimson/osd/shard_services.cc index 866e1e11b9beb..41ea91bcebfc4 100644 --- a/src/crimson/osd/shard_services.cc +++ b/src/crimson/osd/shard_services.cc @@ -85,9 +85,8 @@ void ShardServices::handle_conf_change(const ConfigProxy& conf, } } -template -seastar::future<> ShardServices::do_send_to_osd( - int peer, MsgT m, epoch_t from_epoch) +seastar::future<> ShardServices::send_to_osd( + int peer, MessageURef m, epoch_t from_epoch) { if (osdmap->is_down(peer)) { logger().info("{}: osd.{} is_down", __func__, peer); @@ -103,18 +102,6 @@ seastar::future<> ShardServices::do_send_to_osd( } } -seastar::future<> ShardServices::send_to_osd( - int peer, MessageRef m, epoch_t from_epoch) -{ - return do_send_to_osd(peer, std::move(m), from_epoch); -} - -seastar::future<> ShardServices::send_to_osd( - int peer, MessageURef m, epoch_t from_epoch) -{ - return do_send_to_osd(peer, std::move(m), from_epoch); -} - seastar::future<> ShardServices::dispatch_context_transaction( crimson::os::CollectionRef col, PeeringCtx &ctx) { auto ret = store.do_transaction( diff --git a/src/crimson/osd/shard_services.h b/src/crimson/osd/shard_services.h index 3e37f608e7c0b..b6b48a254b1b7 100644 --- a/src/crimson/osd/shard_services.h +++ b/src/crimson/osd/shard_services.h @@ -59,8 +59,6 @@ class ShardServices : public md_config_obs_t { const char** get_tracked_conf_keys() const final; void handle_conf_change(const ConfigProxy& conf, const std::set &changed) final; - template - seastar::future<> do_send_to_osd(int peer, MsgT m, epoch_t from_epoch); public: ShardServices( @@ -72,11 +70,6 @@ public: crimson::mgr::Client &mgrc, crimson::os::FuturizedStore &store); - seastar::future<> send_to_osd( - int peer, - MessageRef m, - epoch_t from_epoch); - seastar::future<> send_to_osd( int peer, MessageURef m, -- 2.39.5