From 33af821baafbb2e9c4ebea2e377db665e210701f Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 6 May 2020 17:39:03 +0800 Subject: [PATCH] crimson/common: use invoke instead of apply to be consistent with 9b69c7989da57e69ed1bfc7aa122876e67c3d1fd in seasetar, in which, seastar::apply() is deprecated. Signed-off-by: Kefu Chai --- src/crimson/common/errorator.h | 10 ++-- src/crimson/mon/MonClient.cc | 2 +- src/crimson/net/Protocol.cc | 2 +- src/crimson/net/ProtocolV1.cc | 2 +- src/crimson/net/ProtocolV2.cc | 6 +-- src/crimson/net/ProtocolV2.h | 2 +- src/crimson/net/SocketMessenger.cc | 2 +- src/test/crimson/test_messenger.cc | 86 +++++++++++++++--------------- 8 files changed, 56 insertions(+), 56 deletions(-) diff --git a/src/crimson/common/errorator.h b/src/crimson/common/errorator.h index bdace987444b3..e5a814729dd10 100644 --- a/src/crimson/common/errorator.h +++ b/src/crimson/common/errorator.h @@ -19,7 +19,7 @@ inline auto do_for_each(Iterator begin, Iterator end, AsyncAction action) { return futurator::type::errorator_type::template make_ready_future<>(); } while (true) { - auto f = futurator::apply(action, *begin); + auto f = futurator::invoke(action, *begin); ++begin; if (begin == end) { return f; @@ -547,7 +547,7 @@ private: return this->then_wrapped( [ func = std::forward(func) ] (auto&& future) mutable noexcept { - return futurator_t::apply(std::forward(func)).safe_then( + return futurator_t::invoke(std::forward(func)).safe_then( [future = std::forward(future)]() mutable { return std::move(future); }); @@ -786,8 +786,8 @@ private: template static type apply(Func&& func, std::tuple&& args) { try { - return ::seastar::apply(std::forward(func), - std::forward>(args)); + return ::seastar::futurize_apply(std::forward(func), + std::forward>(args)); } catch (...) { return make_exception_future(std::current_exception()); } @@ -942,7 +942,7 @@ struct futurize>> { } template - static inline type apply(Func&& func, FuncArgs&&... args) noexcept { + static inline type invoke(Func&& func, FuncArgs&&... args) noexcept { try { return func(std::forward(args)...); } catch (...) { diff --git a/src/crimson/mon/MonClient.cc b/src/crimson/mon/MonClient.cc index 6adc23a388be9..b20fde1d60e3b 100644 --- a/src/crimson/mon/MonClient.cc +++ b/src/crimson/mon/MonClient.cc @@ -939,7 +939,7 @@ seastar::future<> Client::reopen_session(int rank) #warning fixme auto peer = monmap.get_addrs(rank).front(); logger().info("connecting to mon.{}", rank); - return seastar::futurize_apply( + return seastar::futurize_invoke( [peer, this] () -> seastar::future { auto conn = msgr.connect(peer, CEPH_ENTITY_TYPE_MON); auto& mc = pending_conns.emplace_back( diff --git a/src/crimson/net/Protocol.cc b/src/crimson/net/Protocol.cc index 0cbbe4a49dbda..de2e02cee0343 100644 --- a/src/crimson/net/Protocol.cc +++ b/src/crimson/net/Protocol.cc @@ -70,7 +70,7 @@ void Protocol::close(bool dispatch_reset, } set_write_state(write_state_t::drop); auto gate_closed = pending_dispatch.close(); - auto reset_dispatched = seastar::futurize_apply([this, dispatch_reset, is_replace] { + auto reset_dispatched = seastar::futurize_invoke([this, dispatch_reset, is_replace] { if (dispatch_reset) { return dispatcher.ms_handle_reset( seastar::static_pointer_cast(conn.shared_from_this()), diff --git a/src/crimson/net/ProtocolV1.cc b/src/crimson/net/ProtocolV1.cc index 464a074b14e0a..b7ceb3c50e3ce 100644 --- a/src/crimson/net/ProtocolV1.cc +++ b/src/crimson/net/ProtocolV1.cc @@ -208,7 +208,7 @@ ProtocolV1::handle_connect_reply(msgr_tag_t tag) logger().error("{} missing required features", __func__); throw std::system_error(make_error_code(error::negotiation_failure)); } - return seastar::futurize_apply([this, tag] { + return seastar::futurize_invoke([this, tag] { if (tag == CEPH_MSGR_TAG_SEQ) { return socket->read_exactly(sizeof(seq_num_t)) .then([this] (auto buf) { diff --git a/src/crimson/net/ProtocolV2.cc b/src/crimson/net/ProtocolV2.cc index 516a05ce6e4ad..9ede311b25d1e 100644 --- a/src/crimson/net/ProtocolV2.cc +++ b/src/crimson/net/ProtocolV2.cc @@ -1526,7 +1526,7 @@ void ProtocolV2::execute_accepting() { trigger_state(state_t::ACCEPTING, write_state_t::none, false); gated_dispatch("execute_accepting", [this] { - return seastar::futurize_apply([this] { + return seastar::futurize_invoke([this] { INTERCEPT_N_RW(custom_bp_t::SOCKET_ACCEPTED); auth_meta = seastar::make_lw_shared(); session_stream_handlers = { nullptr, nullptr }; @@ -1658,7 +1658,7 @@ void ProtocolV2::execute_establishing( }); gated_execute("execute_establishing", [this] { - return seastar::futurize_apply([this] { + return seastar::futurize_invoke([this] { return send_server_ident(); }).then([this] { if (unlikely(state != state_t::ESTABLISHING)) { @@ -2009,7 +2009,7 @@ void ProtocolV2::execute_ready(bool dispatch_connect) .then([this] (Tag tag) { switch (tag) { case Tag::MESSAGE: { - return seastar::futurize_apply([this] { + return seastar::futurize_invoke([this] { // throttle_message() logic if (!conn.policy.throttler_messages) { return seastar::now(); diff --git a/src/crimson/net/ProtocolV2.h b/src/crimson/net/ProtocolV2.h index 53d27a3603f8d..bd958f9d40543 100644 --- a/src/crimson/net/ProtocolV2.h +++ b/src/crimson/net/ProtocolV2.h @@ -85,7 +85,7 @@ class ProtocolV2 final : public Protocol { template void gated_execute(const char* what, Func&& func) { gated_dispatch(what, [this, &func] { - execution_done = seastar::futurize_apply(std::forward(func)); + execution_done = seastar::futurize_invoke(std::forward(func)); return execution_done.get_future(); }); } diff --git a/src/crimson/net/SocketMessenger.cc b/src/crimson/net/SocketMessenger.cc index 296c81af4c5aa..294b4cc9a8544 100644 --- a/src/crimson/net/SocketMessenger.cc +++ b/src/crimson/net/SocketMessenger.cc @@ -153,7 +153,7 @@ SocketMessenger::connect(const entity_addr_t& peer_addr, const entity_name_t& pe seastar::future<> SocketMessenger::shutdown() { assert(seastar::engine().cpu_id() == master_sid); - return seastar::futurize_apply([this] { + return seastar::futurize_invoke([this] { if (listener) { auto d_listener = listener; listener = nullptr; diff --git a/src/test/crimson/test_messenger.cc b/src/test/crimson/test_messenger.cc index d0eddf56e9a5b..16e7b4d0ffba2 100644 --- a/src/test/crimson/test_messenger.cc +++ b/src/test/crimson/test_messenger.cc @@ -148,7 +148,7 @@ static seastar::future<> test_echo(unsigned rounds, seastar::future<> dispatch_pingpong(const entity_addr_t& peer_addr) { mono_time start_time = mono_clock::now(); auto conn = msgr->connect(peer_addr, entity_name_t::TYPE_OSD); - return seastar::futurize_apply([this, conn] { + return seastar::futurize_invoke([this, conn] { return do_dispatch_pingpong(conn.get()); }).finally([this, conn, start_time] { auto session = find_session(conn.get()); @@ -1626,7 +1626,7 @@ test_v2_lossy_early_connect_fault(FailoverTest& test) { policy_t::lossy_client, policy_t::stateless_server, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&suite] { + return seastar::futurize_invoke([&suite] { return suite.send_peer(); }).then([&suite] { return suite.connect_peer(); @@ -1658,7 +1658,7 @@ test_v2_lossy_connect_fault(FailoverTest& test) { policy_t::lossy_client, policy_t::stateless_server, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&suite] { + return seastar::futurize_invoke([&suite] { return suite.send_peer(); }).then([&suite] { return suite.connect_peer(); @@ -1690,7 +1690,7 @@ test_v2_lossy_connected_fault(FailoverTest& test) { policy_t::lossy_client, policy_t::stateless_server, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&test] { + return seastar::futurize_invoke([&test] { return test.send_bidirectional(); }).then([&suite] { return suite.connect_peer(); @@ -1729,7 +1729,7 @@ test_v2_lossy_early_accept_fault(FailoverTest& test) { policy_t::stateless_server, policy_t::lossy_client, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&test] { + return seastar::futurize_invoke([&test] { return test.peer_send_me(); }).then([&test] { return test.peer_connect_me(); @@ -1761,7 +1761,7 @@ test_v2_lossy_accept_fault(FailoverTest& test) { policy_t::stateless_server, policy_t::lossy_client, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&test] { + return seastar::futurize_invoke([&test] { return test.peer_send_me(); }).then([&test] { return test.peer_connect_me(); @@ -1791,7 +1791,7 @@ test_v2_lossy_establishing_fault(FailoverTest& test) { policy_t::stateless_server, policy_t::lossy_client, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&test] { + return seastar::futurize_invoke([&test] { return test.peer_send_me(); }).then([&test] { return test.peer_connect_me(); @@ -1825,7 +1825,7 @@ test_v2_lossy_accepted_fault(FailoverTest& test) { policy_t::stateless_server, policy_t::lossy_client, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&test] { + return seastar::futurize_invoke([&test] { return test.send_bidirectional(); }).then([&test] { return test.peer_connect_me(); @@ -1857,7 +1857,7 @@ test_v2_lossless_connect_fault(FailoverTest& test) { policy_t::lossless_client, policy_t::stateful_server, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&test] { + return seastar::futurize_invoke([&test] { return test.send_bidirectional(); }).then([&suite] { return suite.connect_peer(); @@ -1889,7 +1889,7 @@ test_v2_lossless_connected_fault(FailoverTest& test) { policy_t::lossless_client, policy_t::stateful_server, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&test] { + return seastar::futurize_invoke([&test] { return test.send_bidirectional(); }).then([&suite] { return suite.connect_peer(); @@ -1925,7 +1925,7 @@ test_v2_lossless_connected_fault2(FailoverTest& test) { policy_t::lossless_client, policy_t::stateful_server, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&suite] { + return seastar::futurize_invoke([&suite] { return suite.connect_peer(); }).then([&suite] { return suite.wait_established(); @@ -1981,7 +1981,7 @@ test_v2_lossless_reconnect_fault(FailoverTest& test) { policy_t::lossless_client, policy_t::stateful_server, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&test] { + return seastar::futurize_invoke([&test] { return test.send_bidirectional(); }).then([&suite] { return suite.connect_peer(); @@ -2009,7 +2009,7 @@ test_v2_lossless_accept_fault(FailoverTest& test) { policy_t::stateful_server, policy_t::lossless_client, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&test] { + return seastar::futurize_invoke([&test] { return test.send_bidirectional(); }).then([&test] { return test.peer_connect_me(); @@ -2039,7 +2039,7 @@ test_v2_lossless_establishing_fault(FailoverTest& test) { policy_t::stateful_server, policy_t::lossless_client, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&test] { + return seastar::futurize_invoke([&test] { return test.send_bidirectional(); }).then([&test] { return test.peer_connect_me(); @@ -2073,7 +2073,7 @@ test_v2_lossless_accepted_fault(FailoverTest& test) { policy_t::stateful_server, policy_t::lossless_client, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&test] { + return seastar::futurize_invoke([&test] { return test.send_bidirectional(); }).then([&test] { return test.peer_connect_me(); @@ -2113,7 +2113,7 @@ test_v2_lossless_reaccept_fault(FailoverTest& test) { policy_t::stateful_server, policy_t::lossless_client, [&test, bp = bp_pair.second] (FailoverSuite& suite) { - return seastar::futurize_apply([&test] { + return seastar::futurize_invoke([&test] { return test.send_bidirectional(); }).then([&test] { return test.peer_connect_me(); @@ -2161,7 +2161,7 @@ test_v2_peer_connect_fault(FailoverTest& test) { policy_t::lossless_peer, policy_t::lossless_peer, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&suite] { + return seastar::futurize_invoke([&suite] { return suite.send_peer(); }).then([&suite] { return suite.connect_peer(); @@ -2189,7 +2189,7 @@ test_v2_peer_accept_fault(FailoverTest& test) { policy_t::lossless_peer, policy_t::lossless_peer, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&test] { + return seastar::futurize_invoke([&test] { return test.peer_send_me(); }).then([&test] { return test.peer_connect_me(); @@ -2219,7 +2219,7 @@ test_v2_peer_establishing_fault(FailoverTest& test) { policy_t::lossless_peer, policy_t::lossless_peer, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&test] { + return seastar::futurize_invoke([&test] { return test.peer_send_me(); }).then([&test] { return test.peer_connect_me(); @@ -2249,7 +2249,7 @@ test_v2_peer_connected_fault_reconnect(FailoverTest& test) { policy_t::lossless_peer, policy_t::lossless_peer, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&suite] { + return seastar::futurize_invoke([&suite] { return suite.send_peer(); }).then([&suite] { return suite.connect_peer(); @@ -2275,7 +2275,7 @@ test_v2_peer_connected_fault_reaccept(FailoverTest& test) { policy_t::lossless_peer, policy_t::lossless_peer, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&test] { + return seastar::futurize_invoke([&test] { return test.peer_send_me(); }).then([&suite] { return suite.connect_peer(); @@ -2340,7 +2340,7 @@ test_v2_racing_reconnect_win(FailoverTest& test) { policy_t::lossless_peer, policy_t::lossless_peer, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&test] { + return seastar::futurize_invoke([&test] { return test.peer_send_me(); }).then([&test] { return test.peer_connect_me(); @@ -2393,7 +2393,7 @@ test_v2_racing_reconnect_lose(FailoverTest& test) { policy_t::lossless_peer, policy_t::lossless_peer, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&suite] { + return seastar::futurize_invoke([&suite] { return suite.send_peer(); }).then([&suite] { return suite.connect_peer(); @@ -2444,7 +2444,7 @@ test_v2_racing_connect_win(FailoverTest& test) { policy_t::lossless_peer, policy_t::lossless_peer, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&test] { + return seastar::futurize_invoke([&test] { return test.peer_send_me(); }).then([&test] { return test.peer_connect_me(); @@ -2497,7 +2497,7 @@ test_v2_racing_connect_lose(FailoverTest& test) { policy_t::lossless_peer, policy_t::lossless_peer, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&suite] { + return seastar::futurize_invoke([&suite] { return suite.send_peer(); }).then([&suite] { return suite.connect_peer(); @@ -2537,7 +2537,7 @@ test_v2_racing_connect_reconnect_lose(FailoverTest& test) { policy_t::lossless_peer, policy_t::lossless_peer, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&suite] { + return seastar::futurize_invoke([&suite] { return suite.send_peer(); }).then([&suite] { return suite.connect_peer(); @@ -2573,7 +2573,7 @@ test_v2_racing_connect_reconnect_win(FailoverTest& test) { policy_t::lossless_peer, policy_t::lossless_peer, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&test] { + return seastar::futurize_invoke([&test] { return test.peer_send_me(); }).then([&suite] { return suite.connect_peer(); @@ -2610,7 +2610,7 @@ test_v2_stale_connect(FailoverTest& test) { policy_t::lossless_peer, policy_t::lossless_peer, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&suite] { + return seastar::futurize_invoke([&suite] { return suite.connect_peer(); }).then([&suite] { return suite.wait_blocked(); @@ -2646,7 +2646,7 @@ test_v2_stale_reconnect(FailoverTest& test) { policy_t::lossless_peer, policy_t::lossless_peer, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&suite] { + return seastar::futurize_invoke([&suite] { return suite.send_peer(); }).then([&suite] { return suite.connect_peer(); @@ -2683,7 +2683,7 @@ test_v2_stale_accept(FailoverTest& test) { policy_t::lossless_peer, policy_t::lossless_peer, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&test] { + return seastar::futurize_invoke([&test] { return test.peer_connect_me(); }).then([&suite] { return suite.wait_blocked(); @@ -2718,7 +2718,7 @@ test_v2_stale_establishing(FailoverTest& test) { policy_t::lossless_peer, policy_t::lossless_peer, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&test] { + return seastar::futurize_invoke([&test] { return test.peer_connect_me(); }).then([&suite] { return suite.wait_blocked(); @@ -2754,7 +2754,7 @@ test_v2_stale_reaccept(FailoverTest& test) { policy_t::lossless_peer, policy_t::lossless_peer, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&test] { + return seastar::futurize_invoke([&test] { return test.peer_send_me(); }).then([&test] { return test.peer_connect_me(); @@ -2792,7 +2792,7 @@ test_v2_lossy_client(FailoverTest& test) { policy_t::lossy_client, policy_t::stateless_server, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&suite] { + return seastar::futurize_invoke([&suite] { logger().info("-- 0 --"); logger().info("[Test] setup connection..."); return suite.connect_peer(); @@ -2872,7 +2872,7 @@ test_v2_stateless_server(FailoverTest& test) { policy_t::stateless_server, policy_t::lossy_client, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&test] { + return seastar::futurize_invoke([&test] { logger().info("-- 0 --"); logger().info("[Test] setup connection..."); return test.peer_connect_me(); @@ -2952,7 +2952,7 @@ test_v2_lossless_client(FailoverTest& test) { policy_t::lossless_client, policy_t::stateful_server, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&suite] { + return seastar::futurize_invoke([&suite] { logger().info("-- 0 --"); logger().info("[Test] setup connection..."); return suite.connect_peer(); @@ -3028,7 +3028,7 @@ test_v2_stateful_server(FailoverTest& test) { policy_t::stateful_server, policy_t::lossless_client, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&test] { + return seastar::futurize_invoke([&test] { logger().info("-- 0 --"); logger().info("[Test] setup connection..."); return test.peer_connect_me(); @@ -3112,7 +3112,7 @@ test_v2_peer_reuse_connector(FailoverTest& test) { policy_t::lossless_peer_reuse, policy_t::lossless_peer_reuse, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&suite] { + return seastar::futurize_invoke([&suite] { logger().info("-- 0 --"); logger().info("[Test] setup connection..."); return suite.connect_peer(); @@ -3180,7 +3180,7 @@ test_v2_peer_reuse_acceptor(FailoverTest& test) { policy_t::lossless_peer_reuse, policy_t::lossless_peer_reuse, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&test] { + return seastar::futurize_invoke([&test] { logger().info("-- 0 --"); logger().info("[Test] setup connection..."); return test.peer_connect_me(); @@ -3262,7 +3262,7 @@ test_v2_lossless_peer_connector(FailoverTest& test) { policy_t::lossless_peer, policy_t::lossless_peer, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&suite] { + return seastar::futurize_invoke([&suite] { logger().info("-- 0 --"); logger().info("[Test] setup connection..."); return suite.connect_peer(); @@ -3330,7 +3330,7 @@ test_v2_lossless_peer_acceptor(FailoverTest& test) { policy_t::lossless_peer, policy_t::lossless_peer, [&test] (FailoverSuite& suite) { - return seastar::futurize_apply([&test] { + return seastar::futurize_invoke([&test] { logger().info("-- 0 --"); logger().info("[Test] setup connection..."); return test.peer_connect_me(); @@ -3427,7 +3427,7 @@ test_v2_protocol(entity_addr_t test_addr, } return FailoverTest::create(test_peer_addr, test_addr).then([] (auto test) { - return seastar::futurize_apply([test] { + return seastar::futurize_invoke([test] { return test_v2_lossy_early_connect_fault(*test); }).then([test] { return test_v2_lossy_connect_fault(*test); @@ -3471,13 +3471,13 @@ test_v2_protocol(entity_addr_t test_addr, return peer_wins(*test); }).then([test] (bool peer_wins) { if (peer_wins) { - return seastar::futurize_apply([test] { + return seastar::futurize_invoke([test] { return test_v2_racing_connect_lose(*test); }).then([test] { return test_v2_racing_reconnect_lose(*test); }); } else { - return seastar::futurize_apply([test] { + return seastar::futurize_invoke([test] { return test_v2_racing_connect_win(*test); }).then([test] { return test_v2_racing_reconnect_win(*test); -- 2.39.5