From: Sage Weil <sage@newdream.net>
Date: Thu, 1 Feb 2018 23:28:06 +0000 (-0600)
Subject: Revert " luminous: msg/async: unregister connection failed when racing happened"
X-Git-Tag: v12.2.3~53^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f57a80f0a8f4ad4d7d482c05ac8b25fd160f55df;p=ceph.git

Revert " luminous: msg/async: unregister connection failed when racing happened"
---

diff --git a/src/msg/async/AsyncMessenger.h b/src/msg/async/AsyncMessenger.h
index 04d0c0ce94bb..7ebc7777c93e 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;