]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
msg/async/AsyncConnection: unregister connection when racing happened 19552/head
authorHaomai Wang <haomai@xsky.com>
Wed, 15 Nov 2017 10:33:17 +0000 (18:33 +0800)
committerShinobu Kinjo <shinobu@redhat.com>
Fri, 15 Dec 2017 20:17:15 +0000 (05:17 +0900)
Signed-off-by: Haomai Wang <haomai@xsky.com>
(cherry picked from commit 5216309c25522e9e4a3c3a03ceb927079de91e9b)

src/msg/async/AsyncMessenger.h

index 7ebc7777c93e611f1ca49efa78f5edc4654a0b61..04d0c0ce94bb1a63a1624003d57dc89955b8a96d 100644 (file)
@@ -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;