]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
crimson/monc: rename Connection::reply to auth_reply.
authorRadoslaw Zarzynski <rzarzyns@redhat.com>
Tue, 27 Apr 2021 13:23:40 +0000 (13:23 +0000)
committerRadoslaw Zarzynski <rzarzyns@redhat.com>
Tue, 27 Apr 2021 13:26:04 +0000 (13:26 +0000)
Easier to distinguish from local variables with the same name
we have a few in `MonClient.cc`.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
src/crimson/mon/MonClient.cc

index 2628998eb4a18d57856984f54ced306e00ee4e53..6702a882333d9043bac5e899e78a5fae28281f2c 100644 (file)
@@ -95,7 +95,7 @@ private:
 
 private:
   bool closed = false;
-  seastar::shared_promise<Ref<MAuthReply>> reply;
+  seastar::shared_promise<Ref<MAuthReply>> 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<MAuthReply> 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<MAuthReply> 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<MAuthReply>(nullptr));
-  reply = {};
+  auth_reply.set_value(Ref<MAuthReply>(nullptr));
+  auth_reply = {};
   if (auth_done) {
     auth_done->set_value(auth_result_t::canceled);
     auth_done.reset();