]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
msg/async/AsyncConnection: state will be NONE if replacing by another one 18467/head
authorHaomai Wang <haomai@xsky.com>
Mon, 23 Oct 2017 04:38:56 +0000 (12:38 +0800)
committerHaomai Wang <haomai@xsky.com>
Mon, 23 Oct 2017 04:38:56 +0000 (12:38 +0800)
Fixes: http://tracker.ceph.com/issues/21883
Signed-off-by: Haomai Wang <haomai@xsky.com>
src/msg/async/AsyncConnection.cc

index a1da64c04da4d7b7887754214dadefffe63f8450..09ec031f283128d140f88517dc61d39950355e3b 100644 (file)
@@ -1841,7 +1841,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;
   }