crimson/net: s/do_bind/do_listen/ in SocketMessenger.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

diff --git a/src/crimson/net/SocketMessenger.cc b/src/crimson/net/SocketMessenger.cc
index 12010b8625f3b4c8aea384793c773baf06029370..81c12f54b2b0410a428a380dbb1e02888ffa4f15 100644 (file)
--- a/src/crimson/net/SocketMessenger.cc
+++ b/src/crimson/net/SocketMessenger.cc
@@ -53,7 +53,7 @@ seastar::future<> SocketMessenger::set_myaddrs(const entity_addrvec_t& addrs)
   return Messenger::set_myaddrs(my_addrs);
 }
 
-SocketMessenger::bind_ertr::future<> SocketMessenger::do_bind(const entity_addrvec_t& addrs)
+SocketMessenger::bind_ertr::future<> SocketMessenger::do_listen(const entity_addrvec_t& addrs)
 {
   assert(seastar::this_shard_id() == master_sid);
   ceph_assert(addrs.front().get_family() == AF_INET);
@@ -67,9 +67,9 @@ SocketMessenger::bind_ertr::future<> SocketMessenger::do_bind(const entity_addrv
     }
   }).then([this] () -> bind_ertr::future<> {
     const entity_addr_t listen_addr = get_myaddr();
-    logger().debug("{} do_bind: try listen {}...", *this, listen_addr);
+    logger().debug("{} do_listen: try listen {}...", *this, listen_addr);
     if (!listener) {
-      logger().warn("{} do_bind: listener doesn't exist", *this);
+      logger().warn("{} do_listen: listener doesn't exist", *this);
       return bind_ertr::now();
     }
     return listener->listen(listen_addr);
@@ -90,7 +90,7 @@ SocketMessenger::try_bind(const entity_addrvec_t& addrs,
 {
   auto addr = addrs.front();
   if (addr.get_port() != 0) {
-    return do_bind(addrs).safe_then([this] {
+    return do_listen(addrs).safe_then([this] {
       logger().info("{} try_bind: done", *this);
     });
   }
@@ -100,7 +100,7 @@ SocketMessenger::try_bind(const entity_addrvec_t& addrs,
     return seastar::repeat_until_value([this, max_port, addr, &port] {
       auto to_bind = addr;
       to_bind.set_port(port);
-      return do_bind(entity_addrvec_t{to_bind}
+      return do_listen(entity_addrvec_t{to_bind}
       ).safe_then([this] () -> seastar::future<std::optional<bool>> {
         logger().info("{} try_bind: done", *this);
         return seastar::make_ready_future<std::optional<bool>>(

diff --git a/src/crimson/net/SocketMessenger.h b/src/crimson/net/SocketMessenger.h
index 0e1a2e98fa6fb63c58dd797ea1ad091717cbd8bc..f9a225f54fd62b10ddab9ec88817fd15e96282be 100644 (file)
--- a/src/crimson/net/SocketMessenger.h
+++ b/src/crimson/net/SocketMessenger.h
@@ -48,7 +48,7 @@ class SocketMessenger final : public Messenger {
   uint32_t global_seq = 0;
   bool started = false;
 
-  bind_ertr::future<> do_bind(const entity_addrvec_t& addr);
+  bind_ertr::future<> do_listen(const entity_addrvec_t& addr);
 
  public:
   SocketMessenger(const entity_name_t& myname,