]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
msg/async/AsyncConnection: state will be NONE if replacing by another one 18746/head
authorHaomai Wang <haomai@xsky.com>
Mon, 23 Oct 2017 04:38:56 +0000 (12:38 +0800)
committerShinobu Kinjo <shinobu@redhat.com>
Sun, 5 Nov 2017 04:01:38 +0000 (13:01 +0900)
Fixes: http://tracker.ceph.com/issues/21883
Signed-off-by: Haomai Wang <haomai@xsky.com>
(cherry picked from commit f2eb981377f4061debfa67cbd88ca2921a9dfb27)

src/msg/async/AsyncConnection.cc

index e7895ddca75ac321b90548a0edaf7990d04f0ecd..f14be27412b3e612350652b70154b8f194b78ef6 100644 (file)
@@ -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;
   }