From: Haomai Wang <haomaiwang@gmail.com>
Date: Wed, 27 May 2015 08:27:50 +0000 (+0800)
Subject: AsyncConnection: Avoid event creation leak when stopping
X-Git-Tag: v9.0.2~23^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=43ef09dea08f4479a1b723706699b7745ce1fe87;p=ceph.git

AsyncConnection: Avoid event creation leak when stopping

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

diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc
index 9ef88ab8d340..f4745f5a7f09 100644
--- a/src/msg/async/AsyncConnection.cc
+++ b/src/msg/async/AsyncConnection.cc
@@ -2017,8 +2017,8 @@ void AsyncConnection::discard_requeued_up_to(uint64_t seq)
 void AsyncConnection::discard_out_queue()
 {
   ldout(async_msgr->cct, 10) << __func__ << " started" << dendl;
+  assert(write_lock.is_locked());
 
-  Mutex::Locker l(write_lock);
   for (list<pair<bufferlist, Message*> >::iterator p = sent.begin(); p != sent.end(); ++p) {
     ldout(async_msgr->cct, 20) << __func__ << " discard " << p->second << dendl;
     p->second->put();
@@ -2133,6 +2133,7 @@ void AsyncConnection::fault()
 void AsyncConnection::was_session_reset()
 {
   ldout(async_msgr->cct,10) << __func__ << " started" << dendl;
+  Mutex::Locker l(write_lock);
   discard_out_queue();
 
   center->dispatch_event_external(remote_reset_handler);
@@ -2145,6 +2146,7 @@ void AsyncConnection::was_session_reset()
   connect_seq = 0;
   in_seq_acked = 0;
   once_ready = false;
+  can_write = 0;
 }
 
 void AsyncConnection::_stop()
@@ -2154,6 +2156,7 @@ void AsyncConnection::_stop()
     return ;
 
   ldout(async_msgr->cct, 10) << __func__ << dendl;
+  Mutex::Locker l(write_lock);
   if (sd >= 0)
     center->delete_file_event(sd, EVENT_READABLE|EVENT_WRITABLE);
 
@@ -2161,7 +2164,6 @@ void AsyncConnection::_stop()
   async_msgr->unregister_conn(this);
 
   state = STATE_CLOSED;
-  Mutex::Locker l(write_lock);
   open_write = false;
   can_write = 2;
   state_offset = 0;