From: Kefu Chai <tchaikov@gmail.com>
Date: Sun, 24 Mar 2019 02:46:58 +0000 (+0800)
Subject: Merge pull request #26531 from majianpeng/msg-async-optimization
X-Git-Tag: v15.0.0~113
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=673f1e8e7ec6f938eceaf50c065d36d3d1021c2d;p=ceph-ci.git

Merge pull request #26531 from majianpeng/msg-async-optimization

msg/async: optimizations

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
---

673f1e8e7ec6f938eceaf50c065d36d3d1021c2d
diff --cc src/msg/async/AsyncConnection.cc
index d1c7e6016a6,c73b14e2171..5de13c32c02
--- a/src/msg/async/AsyncConnection.cc
+++ b/src/msg/async/AsyncConnection.cc
@@@ -515,8 -516,9 +516,9 @@@ int AsyncConnection::send_message(Messa
      OID_EVENT_TRACE_WITH_MSG(m, "SEND_MSG_OSD_OP_BEGIN", true);
    else if (m->get_type() == CEPH_MSG_OSD_OPREPLY)
      OID_EVENT_TRACE_WITH_MSG(m, "SEND_MSG_OSD_OPREPLY_BEGIN", true);
+ #endif
  
 -  if (async_msgr->get_myaddrs() == get_peer_addrs()) { //loopback connection
 +  if (is_loopback) { //loopback connection
      ldout(async_msgr->cct, 20) << __func__ << " " << *m << " local" << dendl;
      std::lock_guard<std::mutex> l(write_lock);
      if (protocol->is_connected()) {