From: Haomai Wang <haomai@xsky.com>
Date: Tue, 12 Jul 2016 07:51:23 +0000 (+0800)
Subject: msg/async: readd set_priority call
X-Git-Tag: ses5-milestone5~107^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1d4ff2a30a9c55736ccfeb79787e901bac2fb471;p=ceph.git

msg/async: readd set_priority call

Signed-off-by: Haomai Wang <haomai@xsky.com>
---

diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc
index 5012e92df032..c682dd115858 100644
--- a/src/msg/async/AsyncConnection.cc
+++ b/src/msg/async/AsyncConnection.cc
@@ -863,6 +863,7 @@ ssize_t AsyncConnection::_process_connection()
         }
 
         SocketOptions opts;
+        opts.priority = async_msgr->get_socket_priority();
         r = worker->connect(get_peer_addr(), opts, &cs);
         if (r < 0)
           goto fail;
diff --git a/src/msg/async/AsyncMessenger.cc b/src/msg/async/AsyncMessenger.cc
index 0964dad30334..a7270cd52c71 100644
--- a/src/msg/async/AsyncMessenger.cc
+++ b/src/msg/async/AsyncMessenger.cc
@@ -187,6 +187,7 @@ void Processor::accept()
   SocketOptions opts;
   opts.nodelay = msgr->cct->_conf->ms_tcp_nodelay;
   opts.rcbuf_size = msgr->cct->_conf->ms_tcp_rcvbuf;
+  opts.priority = msgr->get_socket_priority();
   while (true) {
     entity_addr_t addr;
     ConnectedSocket cli_socket;
diff --git a/src/msg/async/PosixStack.cc b/src/msg/async/PosixStack.cc
index 54ddf4217dad..65d0bf64b77f 100644
--- a/src/msg/async/PosixStack.cc
+++ b/src/msg/async/PosixStack.cc
@@ -279,6 +279,7 @@ int PosixServerSocketImpl::accept(ConnectedSocket *sock, const SocketOptions &op
     ::close(sd);
     return -errno;
   }
+  handler.set_priority(sd, opt.priority);
 
   std::unique_ptr<PosixConnectedSocketImpl> csi(new PosixConnectedSocketImpl(handler, *out, sd, true));
   *sock = ConnectedSocket(std::move(csi));
@@ -349,6 +350,7 @@ int PosixWorker::connect(const entity_addr_t &addr, const SocketOptions &opts, C
     return -errno;
   }
 
+  net.set_priority(sd, opts.priority);
   *socket = ConnectedSocket(
       std::unique_ptr<PosixConnectedSocketImpl>(new PosixConnectedSocketImpl(net, addr, sd, !opts.nonblock)));
   return 0;
diff --git a/src/msg/async/Stack.h b/src/msg/async/Stack.h
index d6d7a33b0f0c..c397f942612b 100644
--- a/src/msg/async/Stack.h
+++ b/src/msg/async/Stack.h
@@ -40,6 +40,7 @@ struct SocketOptions {
   bool nonblock = true;
   bool nodelay = true;
   int rcbuf_size = 0;
+  int priority = -1;
 };
 
 /// \cond internal