From: Haomai Wang <haomaiwang@gmail.com>
Date: Wed, 11 Feb 2015 09:46:02 +0000 (+0800)
Subject: AsyncConnection: Remove useless inject delay in _stop
X-Git-Tag: suse_latest~36^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=79c018d4c25d948adec29a5461f006a0cc307d8f;p=ceph.git

AsyncConnection: Remove useless inject delay in _stop

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

diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc
index 662b16df01e7..cfef223e03b5 100644
--- a/src/msg/async/AsyncConnection.cc
+++ b/src/msg/async/AsyncConnection.cc
@@ -2084,6 +2084,9 @@ void AsyncConnection::was_session_reset()
 void AsyncConnection::_stop()
 {
   assert(lock.is_locked());
+  if (state == STATE_CLOSED)
+    return ;
+
   ldout(async_msgr->cct, 10) << __func__ << dendl;
   if (sd >= 0)
     center->delete_file_event(sd, EVENT_READABLE|EVENT_WRITABLE);
@@ -2091,15 +2094,6 @@ void AsyncConnection::_stop()
   discard_out_queue();
   async_msgr->unregister_conn(this);
 
-  if (async_msgr->cct->_conf->ms_inject_internal_delays) {
-    ldout(msgr->cct, 10) << __func__ << " sleep for "
-                         << async_msgr->cct->_conf->ms_inject_internal_delays
-                         << dendl;
-    utime_t t;
-    t.set_from_double(async_msgr->cct->_conf->ms_inject_internal_delays);
-    t.sleep();
-  }
-
   state = STATE_CLOSED;
   open_write = false;
   state_offset = 0;