From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Tue, 26 Jul 2022 16:24:12 +0000 (+0000)
Subject: crimson/monc: replace then_unpack() with discard_result() if possible
X-Git-Tag: v18.0.0~418^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f307cae1a1aad61d4068e70da43169063a306354;p=ceph.git

crimson/monc: replace then_unpack() with discard_result() if possible

More understandable this way.

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

diff --git a/src/crimson/mon/MonClient.cc b/src/crimson/mon/MonClient.cc
index 263228c1571c..f2e7f83eb3d6 100644
--- a/src/crimson/mon/MonClient.cc
+++ b/src/crimson/mon/MonClient.cc
@@ -472,7 +472,7 @@ void Client::tick()
       return seastar::when_all_succeed(wait_for_send_log(),
                                        active_con->get_conn()->keepalive(),
                                        active_con->renew_tickets(),
-                                       active_con->renew_rotating_keyring()).then_unpack([] {});
+                                       active_con->renew_rotating_keyring()).discard_result();
     } else {
       assert(is_hunting());
       logger().info("{} continuing the hunt", __func__);
@@ -794,7 +794,7 @@ seastar::future<> Client::handle_monmap(crimson::net::ConnectionRef conn,
       logger().info("handle_monmap: renewing tickets");
       return seastar::when_all_succeed(
 	active_con->renew_tickets(),
-	active_con->renew_rotating_keyring()).then_unpack([](){
+	active_con->renew_rotating_keyring()).then_unpack([] {
 	  logger().info("handle_mon_map: renewed tickets");
 	});
     } else {
@@ -829,7 +829,7 @@ seastar::future<> Client::handle_auth_reply(crimson::net::ConnectionRef conn,
     return active_con->handle_auth_reply(m).then([this] {
       return seastar::when_all_succeed(
         active_con->renew_rotating_keyring(),
-        active_con->renew_tickets()).then_unpack([] {});
+        active_con->renew_tickets()).discard_result();
     });
   } else {
     logger().error("unknown auth reply from {}", conn->get_peer_addr());