From: Kefu Chai <kchai@redhat.com>
Date: Tue, 2 Mar 2021 11:03:38 +0000 (+0800)
Subject: crimson/mon: do not use futurize_invoke
X-Git-Tag: v17.1.0~2790^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=db9b319aab84e47ecc9ba6aa04b40c36eb627c3b;p=ceph-ci.git

crimson/mon: do not use futurize_invoke

flatten the call in seastar::futurize_invoke().

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/mon/MonClient.cc b/src/crimson/mon/MonClient.cc
index 13bb3cf9ff3..0e6df9ae2e6 100644
--- a/src/crimson/mon/MonClient.cc
+++ b/src/crimson/mon/MonClient.cc
@@ -946,14 +946,11 @@ seastar::future<bool> Client::reopen_session(int rank)
       return seastar::now();
     }
     logger().info("connecting to mon.{}", rank);
-    return seastar::futurize_invoke(
-        [peer, this] () -> seastar::future<Connection::auth_result_t> {
-      auto conn = msgr.connect(peer, CEPH_ENTITY_TYPE_MON);
-      auto& mc = pending_conns.emplace_back(
-	std::make_unique<Connection>(auth_registry, conn, &keyring));
-      assert(conn->get_peer_addr().is_msgr2());
-      return mc->authenticate_v2();
-    }).then([peer, this](auto result) {
+    auto conn = msgr.connect(peer, CEPH_ENTITY_TYPE_MON);
+    auto& mc = pending_conns.emplace_back(
+      std::make_unique<Connection>(auth_registry, conn, &keyring));
+    assert(conn->get_peer_addr().is_msgr2());
+    return mc->authenticate_v2().then([peer, this](auto result) {
       if (result == Connection::auth_result_t::success) {
         _finish_auth(peer);
       }
diff --git a/src/crimson/mon/MonClient.h b/src/crimson/mon/MonClient.h
index 70222196f33..9ae4d2a79e8 100644
--- a/src/crimson/mon/MonClient.h
+++ b/src/crimson/mon/MonClient.h
@@ -171,7 +171,7 @@ private:
   // @param rank, rank of the monitor to be connected, if it is less than 0,
   //              try to connect to all monitors in monmap, until one of them
   //              is connected.
-  // @return true if a connection is established to a monitor
+  // @return true if a connection to monitor is established
   seastar::future<bool> reopen_session(int rank);
   std::vector<unsigned> get_random_mons(unsigned n) const;
   seastar::future<> _add_conn(unsigned rank, uint64_t global_id);