From: Haomai Wang <haomai@xsky.com>
Date: Mon, 23 Oct 2017 04:38:56 +0000 (+0800)
Subject: msg/async/AsyncConnection: state will be NONE if replacing by another one
X-Git-Tag: v12.2.3~193^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5234ef2bcaa905861e7c15a9774b82467b2e84e7;p=ceph.git

msg/async/AsyncConnection: state will be NONE if replacing by another one

Fixes: http://tracker.ceph.com/issues/21883
Signed-off-by: Haomai Wang <haomai@xsky.com>
(cherry picked from commit f2eb981377f4061debfa67cbd88ca2921a9dfb27)
---

diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc
index e7895ddca75a..f14be27412b3 100644
--- a/src/msg/async/AsyncConnection.cc
+++ b/src/msg/async/AsyncConnection.cc
@@ -1832,7 +1832,7 @@ ssize_t AsyncConnection::handle_connect_msg(ceph_msg_connect &connect, bufferlis
   }
   if (state != STATE_ACCEPTING_WAIT_CONNECT_MSG_AUTH) {
     ldout(async_msgr->cct, 1) << __func__ << " state changed while accept_conn, it must be mark_down" << dendl;
-    assert(state == STATE_CLOSED);
+    assert(state == STATE_CLOSED || state == STATE_NONE);
     goto fail_registered;
   }