]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
crimson/net: call do_shutdown() in SocketMessenger::stop()
authorKefu Chai <kchai@redhat.com>
Sat, 16 Mar 2019 05:29:50 +0000 (13:29 +0800)
committerKefu Chai <kchai@redhat.com>
Wed, 20 Mar 2019 07:41:39 +0000 (15:41 +0800)
so sharded<SocketMessenger> can stop the messenger service with stop()

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/crimson/net/SocketMessenger.cc
src/crimson/net/SocketMessenger.h

index 46a38ff7ebc9d93f8543b30145dddef0d8be8865..13aa5c56337163b2baac480fd920d0642aeccd3b 100644 (file)
@@ -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) {
index 535dea3a1403ea8cbf1bd2f0f2d5e0c2264815ae..729729194a6ac0b6ff8c26827b8bd39160f00d7b 100644 (file)
@@ -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;