From: Haomai Wang <haomaiwang@gmail.com>
Date: Thu, 13 Jul 2017 15:19:11 +0000 (+0800)
Subject: Revert "msg/async: increase worker reference with local listen table enabled backend"
X-Git-Tag: v12.1.1~33^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8d94ee3586263418281e3df3fd5914913c0106c9;p=ceph.git

Revert "msg/async: increase worker reference with local listen table enabled backend"
---

diff --git a/src/msg/async/AsyncMessenger.cc b/src/msg/async/AsyncMessenger.cc
index 009ff7ac4204..4695844055f1 100644
--- a/src/msg/async/AsyncMessenger.cc
+++ b/src/msg/async/AsyncMessenger.cc
@@ -165,16 +165,12 @@ void Processor::accept()
   opts.nodelay = msgr->cct->_conf->ms_tcp_nodelay;
   opts.rcbuf_size = msgr->cct->_conf->ms_tcp_rcvbuf;
   opts.priority = msgr->get_socket_priority();
-  Worker *w;
   while (true) {
     entity_addr_t addr;
     ConnectedSocket cli_socket;
-    if (msgr->get_stack()->support_local_listen_table()) {
-      w = worker;
-      w->references++;
-    } else {
+    Worker *w = worker;
+    if (!msgr->get_stack()->support_local_listen_table())
       w = msgr->get_stack()->get_worker();
-    }
     int r = listen_socket.accept(&cli_socket, opts, &addr, w);
     if (r == 0) {
       ldout(msgr->cct, 10) << __func__ << " accepted incoming on sd " << cli_socket.fd() << dendl;
@@ -182,7 +178,6 @@ void Processor::accept()
       msgr->add_accept(w, std::move(cli_socket), addr);
       continue;
     } else {
-      w->release_worker();
       if (r == -EINTR) {
         continue;
       } else if (r == -EAGAIN) {