From: Haomai Wang <haomaiwang@gmail.com>
Date: Fri, 8 May 2015 14:56:49 +0000 (+0800)
Subject: AsyncConnection: Avoid assert since replacing may inject when unlock
X-Git-Tag: v9.0.2~202^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a2ee8d79b30f548ead40962eaff21a8aa46455cf;p=ceph.git

AsyncConnection: Avoid assert since replacing may inject when unlock

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

diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc
index 292a06b87287..8373432bc5c4 100644
--- a/src/msg/async/AsyncConnection.cc
+++ b/src/msg/async/AsyncConnection.cc
@@ -1074,19 +1074,20 @@ int AsyncConnection::_process_connection()
         lock.Unlock();
         async_msgr->learned_addr(peer_addr_for_me);
         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();
+          if (rand() % async_msgr->cct->_conf->ms_inject_socket_failures == 0) {
+            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();
+          }
         }
 
         lock.Lock();
         if (state != STATE_CONNECTING_WAIT_IDENTIFY_PEER) {
-          ldout(async_msgr->cct, 1) << __func__ << " state changed while learned_addr, mark_down must be called just now"
-                                    << dendl;
-          assert(state == STATE_CLOSED);
-          goto fail;
+          ldout(async_msgr->cct, 1) << __func__ << " state changed while learned_addr, mark_down or "
+                                    << " replacing must be happened just now" << dendl;
+          return 0;
         }
 
         ::encode(async_msgr->get_myaddr(), myaddrbl);