crimson/osd: implement Heartbeat::ms_handle_reset()

reconnect to peer if the connection is reset

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

diff --git a/src/crimson/osd/heartbeat.cc b/src/crimson/osd/heartbeat.cc
index c1efce85c2e41b57118adf84b004a9c564fd0708..86ff8fa2a7b2b13ae1ff1084a80405894e3461ed 100644 (file)
--- a/src/crimson/osd/heartbeat.cc
+++ b/src/crimson/osd/heartbeat.cc
@@ -236,6 +236,23 @@ seastar::future<> Heartbeat::ms_dispatch(ceph::net::ConnectionRef conn,
   }
 }
 
+seastar::future<> Heartbeat::ms_handle_reset(ceph::net::ConnectionRef conn)
+{
+  auto found = std::find_if(peers.begin(), peers.end(),
+                            [conn](const peers_map_t::value_type& peer) {
+                              return (peer.second.con_front == conn ||
+                                      peer.second.con_back == conn);
+                            });
+  if (found == peers.end()) {
+    return seastar::now();
+  }
+  const auto peer = found->first;
+  const auto epoch = found->second.epoch;
+  return remove_peer(peer).then([peer, epoch, this] {
+    return add_peer(peer, epoch);
+  });
+}
+
 seastar::future<> Heartbeat::handle_osd_ping(ceph::net::ConnectionRef conn,
                                              Ref<MOSDPing> m)
 {

diff --git a/src/crimson/osd/heartbeat.h b/src/crimson/osd/heartbeat.h
index f1565cf466e3a9cf27c4fd3d74ce9f94b072f7c6..63b893fcc9835876f31bf30cc9f5246283a610ab 100644 (file)
--- a/src/crimson/osd/heartbeat.h
+++ b/src/crimson/osd/heartbeat.h
@@ -44,6 +44,7 @@ public:
   // Dispatcher methods
   seastar::future<> ms_dispatch(ceph::net::ConnectionRef conn,
                                MessageRef m) override;
+  seastar::future<> ms_handle_reset(ceph::net::ConnectionRef conn) override;
   AuthAuthorizer* ms_get_authorizer(peer_type_t peer) const override;
 
 private: