From 3b63f4c85c682db13b309233063c057fd01b1289 Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Wed, 8 Sep 2021 19:25:15 +0000 Subject: [PATCH] crimson/net: s/do_bind/do_listen/ in SocketMessenger. Signed-off-by: Radoslaw Zarzynski --- src/crimson/net/SocketMessenger.cc | 10 +++++----- src/crimson/net/SocketMessenger.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/crimson/net/SocketMessenger.cc b/src/crimson/net/SocketMessenger.cc index 12010b8625f..81c12f54b2b 100644 --- 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> { logger().info("{} try_bind: done", *this); return seastar::make_ready_future>( diff --git a/src/crimson/net/SocketMessenger.h b/src/crimson/net/SocketMessenger.h index 0e1a2e98fa6..f9a225f54fd 100644 --- 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, -- 2.39.5