]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert " luminous: msg/async: unregister connection failed when racing happened" 20247/head
authorSage Weil <sage@newdream.net>
Thu, 1 Feb 2018 23:28:06 +0000 (17:28 -0600)
committerGitHub <noreply@github.com>
Thu, 1 Feb 2018 23:28:06 +0000 (17:28 -0600)
src/msg/async/AsyncMessenger.h

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