From fe97d05f0deaf65cbcf688ddb47a86e314f82c6b Mon Sep 17 00:00:00 2001 From: Matan Breizman Date: Mon, 3 Mar 2025 11:59:53 +0000 Subject: [PATCH] crimson/mgr/client: add Client::retry_interval() Could be useful in the future, for now a mere refactor. Signed-off-by: Matan Breizman --- src/crimson/mgr/client.cc | 18 ++++++++++++------ src/crimson/mgr/client.h | 1 + 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/crimson/mgr/client.cc b/src/crimson/mgr/client.cc index 9a9bbbbea99de..6c299f94727c1 100644 --- a/src/crimson/mgr/client.cc +++ b/src/crimson/mgr/client.cc @@ -133,6 +133,17 @@ void Client::ms_handle_reset(crimson::net::ConnectionRef c, bool /* is_replace * }); } +seastar::future<> Client::retry_interval() +{ + LOG_PREFIX(Client::retry_interval); + auto retry_interval = std::chrono::duration( + local_conf().get_val("mgr_connect_retry_interval")); + auto a_while = std::chrono::duration_cast( + retry_interval); + DEBUGDPP("reconnecting in {} seconds", *this, retry_interval); + co_await seastar::sleep(a_while); +} + seastar::future<> Client::reconnect() { LOG_PREFIX(Client::reconnect); @@ -150,12 +161,7 @@ seastar::future<> Client::reconnect() WARNDPP("No active mgr available yet", *this); co_return; } - auto retry_interval = std::chrono::duration( - local_conf().get_val("mgr_connect_retry_interval")); - auto a_while = std::chrono::duration_cast( - retry_interval); - DEBUGDPP("reconnecting in {} seconds", *this, retry_interval); - co_await seastar::sleep(a_while); + co_await retry_interval(); auto peer = mgrmap.get_active_addrs().pick_addr(msgr.get_myaddr().get_type()); if (peer == entity_addr_t{}) { diff --git a/src/crimson/mgr/client.h b/src/crimson/mgr/client.h index aad1f820e7b29..76f2dbc85a158 100644 --- a/src/crimson/mgr/client.h +++ b/src/crimson/mgr/client.h @@ -56,6 +56,7 @@ private: seastar::future<> handle_mgr_conf(crimson::net::ConnectionRef conn, Ref m); seastar::future<> reconnect(); + seastar::future<> retry_interval(); void print(std::ostream&) const; friend std::ostream& operator<<(std::ostream& out, const Client& client); -- 2.39.5