From f48164a8b83eef27e49cfffd079314f6121528a9 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sun, 24 May 2020 12:18:12 +0800 Subject: [PATCH] test/crimson: use invoke instead of apply it's an oversight in 33af821baafbb2e9c4ebea2e377db665e210701f Signed-off-by: Kefu Chai --- src/test/crimson/test_socket.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/crimson/test_socket.cc b/src/test/crimson/test_socket.cc index 2c7faccb34173..1a99d9f490116 100644 --- a/src/test/crimson/test_socket.cc +++ b/src/test/crimson/test_socket.cc @@ -217,7 +217,7 @@ class Connection { logger.debug("dispatch_write(round={}, force_shut={})...", round, force_shut); return seastar::repeat([this, round, force_shut] { if (round != 0 && round <= write_count) { - return seastar::futurize_apply([this, force_shut] { + return seastar::futurize_invoke([this, force_shut] { if (force_shut) { logger.debug("dispatch_write() done, force shutdown output"); socket->force_shutdown_out(); @@ -263,7 +263,7 @@ class Connection { logger.debug("dispatch_read(round={}, force_shut={})...", round, force_shut); return seastar::repeat([this, round, force_shut] { if (round != 0 && round <= read_count) { - return seastar::futurize_apply([this, force_shut] { + return seastar::futurize_invoke([this, force_shut] { if (force_shut) { logger.debug("dispatch_read() done, force shutdown input"); socket->force_shutdown_in(); @@ -274,7 +274,7 @@ class Connection { return seastar::make_ready_future(stop_t::yes); }); } else { - return seastar::futurize_apply([this] { + return seastar::futurize_invoke([this] { // we want to test both Socket::read() and Socket::read_exactly() if (read_count % 2) { return socket->read(DATA_SIZE * sizeof(uint64_t) @@ -342,7 +342,7 @@ class Connection { return seastar::when_all_succeed( conn.dispatch_write_unbounded(), conn.dispatch_read_unbounded(), - seastar::futurize_apply([&conn, preemptive_shut] { + seastar::futurize_invoke([&conn, preemptive_shut] { if (preemptive_shut) { return seastar::sleep(100ms).then([&conn] { logger.debug("dispatch_rw_unbounded() shutdown socket preemptively(100ms)"); @@ -425,7 +425,7 @@ int main(int argc, char** argv) { seastar::app_template app; return app.run(argc, argv, [] { - return seastar::futurize_apply([] { + return seastar::futurize_invoke([] { return test_refused(); }).then([] { return test_bind_same(); -- 2.39.5