From: Haomai Wang <haomai@xsky.com>
Date: Wed, 15 Nov 2017 10:33:17 +0000 (+0800)
Subject: msg/async/AsyncConnection: unregister connection when racing happened
X-Git-Tag: v12.2.3~57^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9a9ed272a76a60d9dafebbcc8ff1356ff4d7a9a6;p=ceph.git

msg/async/AsyncConnection: unregister connection when racing happened

Signed-off-by: Haomai Wang <haomai@xsky.com>
(cherry picked from commit 5216309c25522e9e4a3c3a03ceb927079de91e9b)
---

diff --git a/src/msg/async/AsyncMessenger.h b/src/msg/async/AsyncMessenger.h
index 7ebc7777c93..04d0c0ce94b 100644
--- a/src/msg/async/AsyncMessenger.h
+++ b/src/msg/async/AsyncMessenger.h
@@ -356,9 +356,6 @@ 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;