]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
msg/async/AsyncConnection: make verify auth callback without connection lock 9642/head
authorHaomai Wang <haomai@xsky.com>
Sat, 11 Jun 2016 05:39:23 +0000 (13:39 +0800)
committerHaomai Wang <haomai@xsky.com>
Sat, 11 Jun 2016 05:39:23 +0000 (13:39 +0800)
Fixes: http://tracker.ceph.com/issues/16237
Signed-off-by: Haomai Wang <haomai@xsky.com>
src/msg/async/AsyncConnection.cc

index 5ce6bea7fbbff9c4bb18cb4f24d4808ff92e3353..be4e542f2a4c00bf949870f14749fc1d82108c3f 100644 (file)
@@ -1677,6 +1677,8 @@ ssize_t AsyncConnection::handle_connect_msg(ceph_msg_connect &connect, bufferlis
     return _reply_accept(CEPH_MSGR_TAG_FEATURES, connect, reply, authorizer_reply);
   }
 
+  lock.Unlock();
+
   bool authorizer_valid;
   if (!async_msgr->verify_authorizer(this, peer_type, connect.authorizer_protocol, authorizer_bl,
                                authorizer_reply, authorizer_valid, session_key) || !authorizer_valid) {
@@ -1689,7 +1691,6 @@ ssize_t AsyncConnection::handle_connect_msg(ceph_msg_connect &connect, bufferlis
   ldout(async_msgr->cct, 10) << __func__ << " accept setting up session_security." << dendl;
 
   // existing?
-  lock.Unlock();
   AsyncConnectionRef existing = async_msgr->lookup_conn(peer_addr);
 
   inject_delay();