]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #26531 from majianpeng/msg-async-optimization
authorKefu Chai <tchaikov@gmail.com>
Sun, 24 Mar 2019 02:46:58 +0000 (10:46 +0800)
committerGitHub <noreply@github.com>
Sun, 24 Mar 2019 02:46:58 +0000 (10:46 +0800)
msg/async: optimizations

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
1  2 
src/msg/async/AsyncConnection.cc
src/msg/async/AsyncMessenger.h

index d1c7e6016a61ad48dfcad0fade931fcb6b0c56e7,c73b14e2171397c3e1109c7084b1e2a399140e85..5de13c32c0294bbb55cfcffc2467e829b306eb6e
@@@ -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()) {
Simple merge