AsyncMessenger: Fix leak memory

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>

diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc
index 881db821db45509850f9b28de2d4eb06dd9982b2..ef5d04597179c661f8eb0871956b0902a5a568f8 100644 (file)
--- a/src/msg/async/AsyncConnection.cc
+++ b/src/msg/async/AsyncConnection.cc
@@ -1499,8 +1499,8 @@ int AsyncConnection::handle_connect_msg(ceph_msg_connect &connect, bufferlist &a
     }
 
     ldout(async_msgr->cct, 0) << __func__ << "accept connect_seq " << connect.connect_seq
-                        << " vs existing " << existing->connect_seq
-                        << " state " << existing->state << dendl;
+                              << " vs existing " << existing->connect_seq
+                              << " state " << existing->state << dendl;
 
     if (connect.connect_seq == 0 && existing->connect_seq > 0) {
       ldout(async_msgr->cct,0) << __func__ << " accept peer reset, then tried to connect to us, replacing" << dendl;

diff --git a/src/msg/async/AsyncMessenger.cc b/src/msg/async/AsyncMessenger.cc
index 6886fe6e2a9af2691a4f1291c8a972f24b9f7936..b6ba1446bc25fe0f284e58e943fbc1c85977e220 100644 (file)
--- a/src/msg/async/AsyncMessenger.cc
+++ b/src/msg/async/AsyncMessenger.cc
@@ -465,20 +465,7 @@ void AsyncMessenger::wait()
   ldout(cct,20) << __func__ << ": stopped processor thread" << dendl;
 
   // close all connections
-  lock.Lock();
-  {
-    ldout(cct, 10) << __func__ << ": closing connections" << dendl;
-
-    while (!conns.empty()) {
-      ceph::unordered_map<entity_addr_t, AsyncConnectionRef>::iterator it = conns.begin();
-      AsyncConnectionRef p = it->second;
-      ldout(cct, 5) << __func__ << " " << it->first << " " << p << dendl;
-      conns.erase(it);
-      p->mark_down();
-      ms_deliver_handle_reset(p.get());
-    }
-  }
-  lock.Unlock();
+  mark_down_all();
 
   ldout(cct, 10) << __func__ << ": done." << dendl;
   ldout(cct, 1) << __func__ << " complete." << dendl;
@@ -635,11 +622,19 @@ void AsyncMessenger::mark_down_all()
   while (!conns.empty()) {
     ceph::unordered_map<entity_addr_t, AsyncConnectionRef>::iterator it = conns.begin();
     AsyncConnectionRef p = it->second;
-    ldout(cct, 5) << __func__ << " " << it->first << " " << p << dendl;
+    ldout(cct, 5) << __func__ << " mark down " << it->first << " " << p << dendl;
     conns.erase(it);
     p->mark_down();
     ms_deliver_handle_reset(p.get());
   }
+
+  while (!deleted_conns.empty()) {
+    set<AsyncConnectionRef>::iterator it = deleted_conns.begin();
+    AsyncConnectionRef p = *it;
+    ldout(cct, 5) << __func__ << " delete " << p << dendl;
+    p->put();
+    deleted_conns.erase(it);
+  }
   lock.Unlock();
 }