]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
msg/async/AsyncConnection: make sure no STATE_WAIT -> STATE_STANDBY
authorHaomai Wang <haomai@xsky.com>
Thu, 7 Jul 2016 06:51:03 +0000 (14:51 +0800)
committerHaomai Wang <haomai@xsky.com>
Tue, 12 Jul 2016 15:51:27 +0000 (23:51 +0800)
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>
src/msg/async/AsyncConnection.cc

index a6966c737f7c8de1d2e3e79c6f2ddc872413ec5e..87baf96b682755de63cb1648a159af401f2384a4 100644 (file)
@@ -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();