From a34dda121347f6d3b5cd6e0ed62f587ef747defd Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Tue, 27 Apr 2021 13:23:40 +0000 Subject: [PATCH] crimson/monc: rename Connection::reply to auth_reply. Easier to distinguish from local variables with the same name we have a few in `MonClient.cc`. Signed-off-by: Radoslaw Zarzynski --- src/crimson/mon/MonClient.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/crimson/mon/MonClient.cc b/src/crimson/mon/MonClient.cc index 2628998eb4a..6702a882333 100644 --- a/src/crimson/mon/MonClient.cc +++ b/src/crimson/mon/MonClient.cc @@ -95,7 +95,7 @@ private: private: bool closed = false; - seastar::shared_promise> reply; + seastar::shared_promise> auth_reply; // v2 using clock_t = seastar::lowres_system_clock; clock_t::time_point auth_start; @@ -123,8 +123,8 @@ Connection::Connection(const AuthRegistry& auth_registry, seastar::future<> Connection::handle_auth_reply(Ref m) { logger().info("{}", __func__); - reply.set_value(m); - reply = {}; + auth_reply.set_value(m); + auth_reply = {}; return seastar::now(); } @@ -222,7 +222,7 @@ Connection::do_auth_single(Connection::request_t what) logger().info("sending {}", *m); return conn->send(m).then([this] { logger().info("waiting"); - return reply.get_shared_future(); + return auth_reply.get_shared_future(); }).then([this] (Ref m) { if (!m) { ceph_assert(closed); @@ -376,8 +376,8 @@ int Connection::handle_auth_bad_method(uint32_t old_auth_method, void Connection::close() { logger().info("{}", __func__); - reply.set_value(Ref(nullptr)); - reply = {}; + auth_reply.set_value(Ref(nullptr)); + auth_reply = {}; if (auth_done) { auth_done->set_value(auth_result_t::canceled); auth_done.reset(); -- 2.39.5