]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
test/crimson/test_messenger_thrash: free msgr after its connections
authorYingxin Cheng <yingxin.cheng@intel.com>
Mon, 3 Apr 2023 01:51:02 +0000 (09:51 +0800)
committerMatan Breizman <mbreizma@redhat.com>
Tue, 23 May 2023 13:20:51 +0000 (13:20 +0000)
Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
(cherry picked from commit 3fde061a49ba31c3d64b4a0c2798fc4972100a19)

src/test/crimson/test_messenger_thrash.cc

index d56da0a86e83a804fcdec517e50826135ec4c040..1dd910be9a60d372be3d32e35dbbe511aae6a9c4 100644 (file)
@@ -200,8 +200,10 @@ class SyntheticDispatcher final
 };
 
 class SyntheticWorkload {
+  // messengers must be freed after its connections
   std::set<crimson::net::MessengerRef> available_servers;
   std::set<crimson::net::MessengerRef> available_clients;
+
   crimson::net::SocketPolicy server_policy;
   crimson::net::SocketPolicy client_policy;
   std::map<crimson::net::ConnectionRef,
@@ -452,8 +454,6 @@ class SyntheticWorkload {
          server->stop();
          return server->shutdown();
        });
-     }).then([this] {
-       available_servers.clear();
      }).then([this] {
        return seastar::do_for_each(available_clients, [] (auto client) {
         if (verbose) {
@@ -462,8 +462,6 @@ class SyntheticWorkload {
          client->stop();
          return client->shutdown();
        });
-     }).then([this] {
-       available_clients.clear();
      });
    }