From: Haomai Wang <haomai@xsky.com>
Date: Tue, 13 Jun 2017 02:16:47 +0000 (+0800)
Subject: msg/async: fix accept_conn not remove entry in conns when lazy delete
X-Git-Tag: v11.2.1~92^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=67ee45bbed3975f338b798caf81cd89f80ceb785;p=ceph.git

msg/async: fix accept_conn not remove entry in conns when lazy delete

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

diff --git a/src/msg/async/AsyncMessenger.h b/src/msg/async/AsyncMessenger.h
index d3bb2090f74..7e14cae8850 100644
--- a/src/msg/async/AsyncMessenger.h
+++ b/src/msg/async/AsyncMessenger.h
@@ -340,6 +340,8 @@ public:
       // If conn already in, we will return 0
       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;
       }