From: Haomai Wang <haomai@xsky.com>
Date: Thu, 7 Jul 2016 06:51:03 +0000 (+0800)
Subject: msg/async/AsyncConnection: make sure no STATE_WAIT -> STATE_STANDBY
X-Git-Tag: ses5-milestone5~429^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f04f21892c95dac5fd139d2d51e3d966e35dcf8b;p=ceph.git

msg/async/AsyncConnection: make sure no STATE_WAIT -> STATE_STANDBY

Otherwise if message in queue, we will continue to reconnect right now,
it won't meet our expectation that we want our connect request delay

Signed-off-by: Haomai Wang <haomai@xsky.com>
---

diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc
index a6966c737f7..87baf96b682 100644
--- a/src/msg/async/AsyncConnection.cc
+++ b/src/msg/async/AsyncConnection.cc
@@ -2207,7 +2207,7 @@ void AsyncConnection::fault()
     return ;
   }
   reset_recv_state();
-  if (policy.standby && !is_queued()) {
+  if (policy.standby && !is_queued() && state != STATE_WAIT) {
     ldout(async_msgr->cct,0) << __func__ << " with nothing to send, going to standby" << dendl;
     state = STATE_STANDBY;
     write_lock.Unlock();