]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
msg/async: readd set_priority call
authorHaomai Wang <haomai@xsky.com>
Tue, 12 Jul 2016 07:51:23 +0000 (15:51 +0800)
committerHaomai Wang <haomai@xsky.com>
Tue, 16 Aug 2016 15:19:25 +0000 (23:19 +0800)
Signed-off-by: Haomai Wang <haomai@xsky.com>
src/msg/async/AsyncConnection.cc
src/msg/async/AsyncMessenger.cc
src/msg/async/PosixStack.cc
src/msg/async/Stack.h

index 5012e92df0328b6164c6d93677ed9b4385038125..c682dd1158584ef1cef3692320eb4bf47fa30989 100644 (file)
@@ -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;
index 0964dad30334b08e751b7459df01f09dfa313ba1..a7270cd52c7126d4b039cbc0ef1c881ab03901c9 100644 (file)
@@ -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;
index 54ddf4217dade6b58fb6a7d6b5eb11af96e1a33e..65d0bf64b77f0a6d59f6d58586996c64659ff42b 100644 (file)
@@ -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;
index d6d7a33b0f0c5ad531e0673db3a1db90ee90d061..c397f942612befa1c2c39704ce116f1d4e5557d1 100644 (file)
@@ -40,6 +40,7 @@ struct SocketOptions {
   bool nonblock = true;
   bool nodelay = true;
   int rcbuf_size = 0;
+  int priority = -1;
 };
 
 /// \cond internal