]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
AsyncConnection: Drop connect_seq increase line
authorHaomai Wang <haomaiwang@gmail.com>
Wed, 25 Feb 2015 15:44:10 +0000 (23:44 +0800)
committerHaomai Wang <haomaiwang@gmail.com>
Thu, 26 Feb 2015 07:35:59 +0000 (15:35 +0800)
Learn commit 249acf62e764f9d08104c1a070e382a2fdab8824

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
src/msg/async/AsyncConnection.cc

index a0deea1f2d47e9fd46d7f6c0d35ea7bfc3fda56e..e230d2a20a3b2e348ff94d496c02d7ae65d5c523 100644 (file)
@@ -285,7 +285,6 @@ int AsyncConnection::_try_send(bufferlist send_bl, bool send)
   // standby?
   if (is_queued() && state == STATE_STANDBY && !policy.server) {
     assert(!outcoming_bl.length());
-    connect_seq++;
     state = STATE_CONNECTING;
     center->dispatch_event_external(read_handler);
     return 0;
@@ -2038,7 +2037,7 @@ void AsyncConnection::fault()
 
   if (!(state >= STATE_CONNECTING && state < STATE_CONNECTING_READY)) {
     // policy maybe empty when state is in accept
-    if (policy.server || (state >= STATE_ACCEPTING && state < STATE_ACCEPTING_WAIT_SEQ)) {
+    if (policy.server) {
       ldout(async_msgr->cct, 0) << __func__ << " server, going to standby" << dendl;
       state = STATE_STANDBY;
     } else {