From: Changcheng Liu <changcheng.liu@aliyun.com>
Date: Tue, 27 Aug 2019 16:31:08 +0000 (+0800)
Subject: msg/async/rdma: librdamcm set local_qpn after creating QueuePair
X-Git-Tag: v15.1.0~1481^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ba65dd7e41a4a0e0099ecf856cca90659f96550d;p=ceph.git

msg/async/rdma: librdamcm set local_qpn after creating QueuePair

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
---

diff --git a/src/msg/async/rdma/RDMAIWARPConnectedSocketImpl.cc b/src/msg/async/rdma/RDMAIWARPConnectedSocketImpl.cc
index 3d9c35de4b9..354d95eb136 100644
--- a/src/msg/async/rdma/RDMAIWARPConnectedSocketImpl.cc
+++ b/src/msg/async/rdma/RDMAIWARPConnectedSocketImpl.cc
@@ -29,7 +29,6 @@ RDMAIWARPConnectedSocketImpl::RDMAIWARPConnectedSocketImpl(CephContext *cct, sha
       status = CHANNEL_FD_CREATED;
     }, false);
     status = RESOURCE_ALLOCATED;
-    local_qpn = qp->get_local_qp_number();
     qp->get_local_cm_meta().peer_qpn = peer_qpn;
     qp->get_peer_cm_meta().local_qpn = peer_qpn;
   } else {
@@ -98,8 +97,6 @@ void RDMAIWARPConnectedSocketImpl::handle_cm_connection() {
         notify();
         break;
       }
-      local_qpn = qp->get_local_qp_number();
-      qp->get_local_cm_meta().local_qpn = local_qpn;
 
       memset(&cm_params, 0, sizeof(cm_params));
       cm_params.retry_count = RETRY_COUNT;
@@ -165,6 +162,7 @@ int RDMAIWARPConnectedSocketImpl::alloc_resource() {
   if (!qp) {
     return -1;
   }
+  local_qpn = qp->get_local_qp_number();
   dispatcher->register_qp(qp, this);
   dispatcher->perf_logger->inc(l_msgr_rdma_created_queue_pair);
   dispatcher->perf_logger->inc(l_msgr_rdma_active_queue_pair);