crimson/osd: pass `Connection*` to Dispatch::ms_dispatch()

it's a regression introduced by c69bf0c002f1b62283b3eb5df62fdcb65963b4ae

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/crimson/osd/heartbeat.cc b/src/crimson/osd/heartbeat.cc
index 9d8b1bb640c58aaa44c513e21d51ea9131c0fc31..4a1f04a7758464e323c33f6990a2b743f549f364 100644 (file)
--- 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 cdc0c3935051318122046364d5d3576699f2656f..16908a24ae31bba19c5f271b7f447a8dfe1744ec 100644 (file)
--- a/src/crimson/osd/osd.cc
+++ b/src/crimson/osd/osd.cc
@@ -359,7 +359,7 @@ seastar::future<Ref<PG>> 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<MOSDMap> 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<MOSDOp> 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<MOSDPGNotify> 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<MOSDPGInfo> 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<MOSDPGQuery> 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<MOSDPGLog> m)
 {
   const int from = m->get_source().num();

diff --git a/src/crimson/osd/osd.h b/src/crimson/osd/osd.h
index 4486157da43777823e2331730fd9df6c820a1565..d1af35b8855aaafcceac6b7992c050d6ad6eeae9 100644 (file)
--- 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<MOSDMap> m);
-  seastar::future<> handle_osd_op(ceph::net::ConnectionRef conn,
+  seastar::future<> handle_osd_op(ceph::net::Connection* conn,
                                  Ref<MOSDOp> m);
-  seastar::future<> handle_pg_log(ceph::net::ConnectionRef conn,
+  seastar::future<> handle_pg_log(ceph::net::Connection* conn,
                                  Ref<MOSDPGLog> m);
-  seastar::future<> handle_pg_notify(ceph::net::ConnectionRef conn,
+  seastar::future<> handle_pg_notify(ceph::net::Connection* conn,
                                     Ref<MOSDPGNotify> m);
-  seastar::future<> handle_pg_info(ceph::net::ConnectionRef conn,
+  seastar::future<> handle_pg_info(ceph::net::Connection* conn,
                                   Ref<MOSDPGInfo> m);
-  seastar::future<> handle_pg_query(ceph::net::ConnectionRef conn,
+  seastar::future<> handle_pg_query(ceph::net::Connection* conn,
                                    Ref<MOSDPGQuery> m);
 
   seastar::future<> committed_osd_maps(version_t first,

diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc
index dffb98d1fc7b4927eb93150f03dfdc02139dfe0c..868522945bbf914f590bb613a05189d2ceea307e 100644 (file)
--- a/src/crimson/osd/pg.cc
+++ b/src/crimson/osd/pg.cc
@@ -1018,7 +1018,7 @@ seastar::future<Ref<MOSDOpReply>> PG::do_osd_ops(Ref<MOSDOp> m)
   });
 }
 
-seastar::future<> PG::handle_op(ceph::net::ConnectionRef conn,
+seastar::future<> PG::handle_op(ceph::net::Connection* conn,
                                 Ref<MOSDOp> m)
 {
   return wait_for_active().then([conn, m, this] {

diff --git a/src/crimson/osd/pg.h b/src/crimson/osd/pg.h
index 47340f034f464a9b9224fe293c7b201c9a7b3ed0..180b13dac5f60a58dd927fc17e278a30836d6768 100644 (file)
--- 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<MOSDOp> m);
   void print(ostream& os) const;
 private: