Merge pull request #10003 from dachary/wip-16380-jewel

jewel: msg/async: connection race hang Reviewed-by: Haomai Wang <haomai@xsky.com>
ceph · Aug 4, 2016 · 093f30d · 093f30d
2 parents 648442b + 3dbb08a
commit 093f30d
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc
@@ -1076,9 +1076,12 @@ ssize_t AsyncConnection::_process_connection()
           ldout(async_msgr->cct, 1) << __func__ << " reconnect failed " << dendl;
           goto fail;
         } else if (r > 0) {
+          ldout(async_msgr->cct, 10) << __func__ << " nonblock connect inprogress" << dendl;
+          center->create_file_event(sd, EVENT_WRITABLE, read_handler);
           break;
         }
 
+        center->delete_file_event(sd, EVENT_WRITABLE);
         state = STATE_CONNECTING_WAIT_BANNER;
         break;
       }