From: Kefu Chai <kchai@redhat.com>
Date: Sat, 17 Jul 2021 02:23:20 +0000 (+0800)
Subject: test/crimson/test_alien_echo: msgr->stop() before shutdown
X-Git-Tag: v17.1.0~1379^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F42385%2Fhead;p=ceph.git

test/crimson/test_alien_echo: msgr->stop() before shutdown

it is required to remove all registered dispatchers before shutting down a
messenger. otherwise assert(dispatchers.empty()) in SocketMessenger::shutdown() fails.

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

diff --git a/src/test/crimson/test_alien_echo.cc b/src/test/crimson/test_alien_echo.cc
index ea2e1a37c28..28df6d6bff3 100644
--- a/src/test/crimson/test_alien_echo.cc
+++ b/src/test/crimson/test_alien_echo.cc
@@ -193,6 +193,7 @@ seastar_echo(const entity_addr_t addr, echo_role role, unsigned count)
         });
       }).finally([&server] {
         std::cout << "server shutting down" << std::endl;
+        server.msgr->stop();
         return server.msgr->shutdown();
       });
     });
@@ -221,6 +222,7 @@ seastar_echo(const entity_addr_t addr, echo_role role, unsigned count)
         );
       }).finally([&client] {
         std::cout << "client shutting down" << std::endl;
+        client.msgr->stop();
         return client.msgr->shutdown();
       });
     });