From db9b319aab84e47ecc9ba6aa04b40c36eb627c3b Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 2 Mar 2021 19:03:38 +0800 Subject: [PATCH] crimson/mon: do not use futurize_invoke flatten the call in seastar::futurize_invoke(). Signed-off-by: Kefu Chai --- src/crimson/mon/MonClient.cc | 13 +++++-------- src/crimson/mon/MonClient.h | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/crimson/mon/MonClient.cc b/src/crimson/mon/MonClient.cc index 13bb3cf9ff34f..0e6df9ae2e6af 100644 --- a/src/crimson/mon/MonClient.cc +++ b/src/crimson/mon/MonClient.cc @@ -946,14 +946,11 @@ seastar::future Client::reopen_session(int rank) return seastar::now(); } logger().info("connecting to mon.{}", rank); - return seastar::futurize_invoke( - [peer, this] () -> seastar::future { - auto conn = msgr.connect(peer, CEPH_ENTITY_TYPE_MON); - auto& mc = pending_conns.emplace_back( - std::make_unique(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(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 70222196f3303..9ae4d2a79e8f5 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 reopen_session(int rank); std::vector get_random_mons(unsigned n) const; seastar::future<> _add_conn(unsigned rank, uint64_t global_id); -- 2.39.5