]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
AsyncConnection: avoid debug log in cleanup_handler 7547/head
authorHaomai Wang <haomai@xsky.com>
Sat, 6 Feb 2016 06:52:43 +0000 (14:52 +0800)
committerHaomai Wang <haomai@xsky.com>
Sat, 6 Feb 2016 07:40:25 +0000 (15:40 +0800)
local connection will be stop and call cleanup_handler after messenger
is down
introduced in
commit(https://github.com/ceph/ceph/commit/9da2fffd31562ed5d0b795d7862b3ebec66aba40)

Fix #14679

Signed-off-by: Haomai Wang <haomai@xsky.com>
src/msg/async/AsyncConnection.cc
src/msg/async/AsyncConnection.h

index 4c51fe1e269c204b389432765798a9f85ed4792c..9398e915c2e5e56345317e4a121ebcbb6c2d702e 100644 (file)
@@ -2567,16 +2567,3 @@ void AsyncConnection::local_deliver()
     write_lock.Lock();
   }
 }
-
-void AsyncConnection::cleanup_handler()
-{
-  ldout(async_msgr->cct, 1) << __func__ << dendl;
-
-  delete read_handler;
-  delete write_handler;
-  delete reset_handler;
-  delete remote_reset_handler;
-  delete connect_handler;
-  delete local_deliver_handler;
-  delete wakeup_handler;
-}
index f9a65728fa26671bffb28f3b6b654f47abf83c87..049c2afee15a650fe590b2d912291df4964facee 100644 (file)
@@ -315,7 +315,15 @@ class AsyncConnection : public Connection {
     lock.Unlock();
     mark_down();
   }
-  void cleanup_handler();
+  void cleanup_handler() {
+    delete read_handler;
+    delete write_handler;
+    delete reset_handler;
+    delete remote_reset_handler;
+    delete connect_handler;
+    delete local_deliver_handler;
+    delete wakeup_handler;
+  }
   PerfCounters *get_perf_counter() {
     return logger;
   }