From: Kefu Chai Date: Thu, 25 Apr 2019 12:31:17 +0000 (+0800) Subject: crimson/osd: pass `Connection*` to Dispatch::ms_dispatch() X-Git-Tag: v15.1.0~2803^2~11 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4cef78aa916fd118ffb6c9dbd8f5b1415700ca0f;p=ceph-ci.git crimson/osd: pass `Connection*` to Dispatch::ms_dispatch() it's a regression introduced by c69bf0c002f1b62283b3eb5df62fdcb65963b4ae Signed-off-by: Kefu Chai --- diff --git a/src/crimson/osd/heartbeat.cc b/src/crimson/osd/heartbeat.cc index 9d8b1bb640c..4a1f04a7758 100644 --- a/src/crimson/osd/heartbeat.cc +++ b/src/crimson/osd/heartbeat.cc @@ -276,10 +276,10 @@ seastar::future<> Heartbeat::handle_reply(ceph::net::Connection* conn, } const auto now = clock::now(); auto& unacked = ping->second.unacknowledged; - if (conn == peer.con_back) { + if (conn == peer.con_back.get()) { peer.last_rx_back = now; unacked--; - } else if (conn == peer.con_front) { + } else if (conn == peer.con_front.get()) { peer.last_rx_front = now; unacked--; } diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc index cdc0c393505..16908a24ae3 100644 --- a/src/crimson/osd/osd.cc +++ b/src/crimson/osd/osd.cc @@ -359,7 +359,7 @@ seastar::future> OSD::load_pg(spg_t pgid) }); } -seastar::future<> OSD::ms_dispatch(ceph::net::ConnectionRef conn, MessageRef m) +seastar::future<> OSD::ms_dispatch(ceph::net::Connection* conn, MessageRef m) { if (state.is_stopping()) { return seastar::now(); @@ -520,7 +520,7 @@ seastar::future<> OSD::osdmap_subscribe(version_t epoch, bool force_request) } } -seastar::future<> OSD::handle_osd_map(ceph::net::ConnectionRef conn, +seastar::future<> OSD::handle_osd_map(ceph::net::Connection* conn, Ref m) { logger().info("handle_osd_map {}", *m); @@ -651,7 +651,7 @@ seastar::future<> OSD::committed_osd_maps(version_t first, }); } -seastar::future<> OSD::handle_osd_op(ceph::net::ConnectionRef conn, +seastar::future<> OSD::handle_osd_op(ceph::net::Connection* conn, Ref m) { return wait_for_map(m->get_map_epoch()).then([=](epoch_t epoch) { @@ -740,7 +740,7 @@ void OSD::update_heartbeat_peers() heartbeat->update_peers(whoami); } -seastar::future<> OSD::handle_pg_notify(ceph::net::ConnectionRef conn, +seastar::future<> OSD::handle_pg_notify(ceph::net::Connection* conn, Ref m) { // assuming all pgs reside in a single shard @@ -769,7 +769,7 @@ seastar::future<> OSD::handle_pg_notify(ceph::net::ConnectionRef conn, }); } -seastar::future<> OSD::handle_pg_info(ceph::net::ConnectionRef conn, +seastar::future<> OSD::handle_pg_info(ceph::net::Connection* conn, Ref m) { // assuming all pgs reside in a single shard @@ -789,7 +789,7 @@ seastar::future<> OSD::handle_pg_info(ceph::net::ConnectionRef conn, }); } -seastar::future<> OSD::handle_pg_query(ceph::net::ConnectionRef conn, +seastar::future<> OSD::handle_pg_query(ceph::net::Connection* conn, Ref m) { const int from = m->get_source().num(); @@ -805,7 +805,7 @@ seastar::future<> OSD::handle_pg_query(ceph::net::ConnectionRef conn, }); } -seastar::future<> OSD::handle_pg_log(ceph::net::ConnectionRef conn, +seastar::future<> OSD::handle_pg_log(ceph::net::Connection* conn, Ref m) { const int from = m->get_source().num(); diff --git a/src/crimson/osd/osd.h b/src/crimson/osd/osd.h index 4486157da43..d1af35b8855 100644 --- a/src/crimson/osd/osd.h +++ b/src/crimson/osd/osd.h @@ -86,7 +86,7 @@ class OSD : public ceph::net::Dispatcher, OSDSuperblock superblock; // Dispatcher methods - seastar::future<> ms_dispatch(ceph::net::ConnectionRef conn, MessageRef m) override; + seastar::future<> ms_dispatch(ceph::net::Connection* conn, MessageRef m) override; seastar::future<> ms_handle_connect(ceph::net::ConnectionRef conn) override; seastar::future<> ms_handle_reset(ceph::net::ConnectionRef conn) override; seastar::future<> ms_handle_remote_reset(ceph::net::ConnectionRef conn) override; @@ -137,17 +137,17 @@ private: void write_superblock(ceph::os::Transaction& t); seastar::future<> read_superblock(); - seastar::future<> handle_osd_map(ceph::net::ConnectionRef conn, + seastar::future<> handle_osd_map(ceph::net::Connection* conn, Ref m); - seastar::future<> handle_osd_op(ceph::net::ConnectionRef conn, + seastar::future<> handle_osd_op(ceph::net::Connection* conn, Ref m); - seastar::future<> handle_pg_log(ceph::net::ConnectionRef conn, + seastar::future<> handle_pg_log(ceph::net::Connection* conn, Ref m); - seastar::future<> handle_pg_notify(ceph::net::ConnectionRef conn, + seastar::future<> handle_pg_notify(ceph::net::Connection* conn, Ref m); - seastar::future<> handle_pg_info(ceph::net::ConnectionRef conn, + seastar::future<> handle_pg_info(ceph::net::Connection* conn, Ref m); - seastar::future<> handle_pg_query(ceph::net::ConnectionRef conn, + seastar::future<> handle_pg_query(ceph::net::Connection* conn, Ref m); seastar::future<> committed_osd_maps(version_t first, diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc index dffb98d1fc7..868522945bb 100644 --- a/src/crimson/osd/pg.cc +++ b/src/crimson/osd/pg.cc @@ -1018,7 +1018,7 @@ seastar::future> PG::do_osd_ops(Ref m) }); } -seastar::future<> PG::handle_op(ceph::net::ConnectionRef conn, +seastar::future<> PG::handle_op(ceph::net::Connection* conn, Ref m) { return wait_for_active().then([conn, m, this] { diff --git a/src/crimson/osd/pg.h b/src/crimson/osd/pg.h index 47340f034f4..180b13dac5f 100644 --- a/src/crimson/osd/pg.h +++ b/src/crimson/osd/pg.h @@ -114,7 +114,7 @@ public: seastar::future<> handle_activate_map(); seastar::future<> share_pg_info(); void reply_pg_query(const MQuery& query, recovery::Context* ctx); - seastar::future<> handle_op(ceph::net::ConnectionRef conn, + seastar::future<> handle_op(ceph::net::Connection* conn, Ref m); void print(ostream& os) const; private: