From f57a80f0a8f4ad4d7d482c05ac8b25fd160f55df Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 1 Feb 2018 17:28:06 -0600 Subject: [PATCH] Revert " luminous: msg/async: unregister connection failed when racing happened" --- src/msg/async/AsyncMessenger.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/msg/async/AsyncMessenger.h b/src/msg/async/AsyncMessenger.h index 04d0c0ce94bb1..7ebc7777c93e6 100644 --- a/src/msg/async/AsyncMessenger.h +++ b/src/msg/async/AsyncMessenger.h @@ -356,6 +356,9 @@ public: Mutex::Locker l(deleted_lock); if (deleted_conns.erase(existing)) { existing->get_perf_counter()->dec(l_msgr_active_connections); + conns.erase(it); + } else if (conn != existing) { + return -1; } } conns[conn->peer_addr] = conn; -- 2.39.5