From 4de0c355526990a98bb503581d2ad3156cc5d640 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sat, 16 Mar 2019 13:29:50 +0800 Subject: [PATCH] crimson/net: call do_shutdown() in SocketMessenger::stop() so sharded can stop the messenger service with stop() Signed-off-by: Kefu Chai --- src/crimson/net/SocketMessenger.cc | 5 +++++ src/crimson/net/SocketMessenger.h | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) 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; -- 2.39.5