From: Kefu Chai <kchai@redhat.com>
Date: Sat, 16 Mar 2019 05:29:50 +0000 (+0800)
Subject: crimson/net: call do_shutdown() in SocketMessenger::stop()
X-Git-Tag: v15.0.0~186^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4de0c355526990a98bb503581d2ad3156cc5d640;p=ceph-ci.git

crimson/net: call do_shutdown() in SocketMessenger::stop()

so sharded<SocketMessenger> can stop the messenger service with stop()

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

diff --git a/src/crimson/net/SocketMessenger.cc b/src/crimson/net/SocketMessenger.cc
index 46a38ff7ebc..13aa5c56337 100644
--- a/src/crimson/net/SocketMessenger.cc
+++ b/src/crimson/net/SocketMessenger.cc
@@ -112,6 +112,11 @@ SocketMessenger::connect(const entity_addr_t& peer_addr, const entity_type_t& pe
     });
 }
 
+seastar::future<> SocketMessenger::stop()
+{
+  return do_shutdown();
+}
+
 seastar::future<> SocketMessenger::shutdown()
 {
   return container().invoke_on_all([](auto& msgr) {
diff --git a/src/crimson/net/SocketMessenger.h b/src/crimson/net/SocketMessenger.h
index 535dea3a140..729729194a6 100644
--- a/src/crimson/net/SocketMessenger.h
+++ b/src/crimson/net/SocketMessenger.h
@@ -107,9 +107,7 @@ class SocketMessenger final : public Messenger, public seastar::peering_sharded_
   void unregister_conn(SocketConnectionRef);
 
   // required by sharded<>
-  seastar::future<> stop() {
-    return seastar::make_ready_future<>();
-  }
+  seastar::future<> stop();
 
   seastar::shard_id shard_id() const {
     return sid;