Merge pull request #13716 from Adirl/move_counter

msg/async/rdma: move active_queue_pairs perf counter dec to polling Reviewed-by: Haomai Wang <haomai@xsky.com>
ceph · Mar 1, 2017 · 3955cac · 3955cac
2 parents 2bcd9d7 + b364d24
commit 3955cac
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/src/msg/async/rdma/RDMAConnectedSocketImpl.cc b/src/msg/async/rdma/RDMAConnectedSocketImpl.cc
@@ -42,7 +42,6 @@ RDMAConnectedSocketImpl::RDMAConnectedSocketImpl(CephContext *cct, Infiniband* i
 RDMAConnectedSocketImpl::~RDMAConnectedSocketImpl()
 {
   ldout(cct, 20) << __func__ << " destruct." << dendl;
-  dispatcher->perf_logger->dec(l_msgr_rdma_active_queue_pair);
   cleanup();
   worker->remove_pending_conn(this);
   dispatcher->erase_qpn(my_msg.qpn);

diff --git a/src/msg/async/rdma/RDMAStack.cc b/src/msg/async/rdma/RDMAStack.cc
@@ -146,6 +146,7 @@ void RDMADispatcher::polling()
         while (!dead_queue_pairs.empty()) {
           ldout(cct, 10) << __func__ << " finally delete qp=" << dead_queue_pairs.back() << dendl;
           delete dead_queue_pairs.back();
+          perf_logger->dec(l_msgr_rdma_active_queue_pair);
           dead_queue_pairs.pop_back();
         }
       }