From: Kefu Chai <kchai@redhat.com>
Date: Thu, 17 Jun 2021 02:53:34 +0000 (+0800)
Subject: crimson/tools/store_nbd: s/socket/server_socket/
X-Git-Tag: v17.1.0~1619^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7f2e8c366e2c5071bd0b35503f2f16f1706d0a24;p=ceph.git

crimson/tools/store_nbd: s/socket/server_socket/

to prepare for the next commit, which will keep track of the
connected_socket as another member variable.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/tools/store_nbd/store-nbd.cc b/src/crimson/tools/store_nbd/store-nbd.cc
index d678112ed33e..1d5953d6464e 100644
--- a/src/crimson/tools/store_nbd/store-nbd.cc
+++ b/src/crimson/tools/store_nbd/store-nbd.cc
@@ -218,7 +218,7 @@ struct RequestWriter {
 class NBDHandler {
   BlockDriver &backend;
   std::string uds_path;
-  std::optional<seastar::server_socket> socket;
+  std::optional<seastar::server_socket> server_socket;
   seastar::gate gate;
 public:
   struct config_t {
@@ -423,13 +423,13 @@ seastar::future<> handle_commands(
 seastar::future<> NBDHandler::run()
 {
   logger().debug("About to listen on {}", uds_path);
-  socket = seastar::engine().listen(
+  server_socket = seastar::engine().listen(
       seastar::socket_address{
       seastar::unix_domain_addr{uds_path}});
 
   return seastar::keep_doing([this] {
     return seastar::try_with_gate(gate, [this] {
-      return socket->accept().then([this](auto acc) {
+      return server_socket->accept().then([this](auto acc) {
         logger().debug("Accepted");
         return seastar::do_with(
           std::move(acc.connection),
@@ -461,9 +461,9 @@ seastar::future<> NBDHandler::run()
 seastar::future<> NBDHandler::stop()
 {
   seastar::future<> done = gate.close();
-  if (socket) {
-    socket->abort_accept();
-    socket.reset();
+  if (server_socket) {
+    server_socket->abort_accept();
+    server_socket.reset();
   }
   return done;
 }