From 00455ea63b4e0592bd7809227d638ab3ae6d1151 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sun, 7 Jun 2020 12:16:55 +0800 Subject: [PATCH] test/crimson: avoid using variadic future see also 3cee25ba41069e9e9b4855f99be20910759440ca Signed-off-by: Kefu Chai --- src/tools/crimson/perf_crimson_msgr.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/tools/crimson/perf_crimson_msgr.cc b/src/tools/crimson/perf_crimson_msgr.cc index 7ed27dd744c..70335c44476 100644 --- a/src/tools/crimson/perf_crimson_msgr.cc +++ b/src/tools/crimson/perf_crimson_msgr.cc @@ -641,11 +641,12 @@ static seastar::future<> run( }; }; - return seastar::when_all_succeed( + return seastar::when_all( test_state::Server::create(server_conf.core, server_conf.block_size), create_sharded(client_conf.jobs, client_conf.block_size, client_conf.depth) - ).then([=](test_state::ServerFRef fp_server, - test_state::Client *client) { + ).then([=](auto&& ret) { + auto fp_server = std::move(std::get<0>(ret).get0()); + auto client = std::move(std::get<1>(ret).get0()); test_state::Server* server = fp_server.get(); if (mode == perf_mode_t::both) { logger().info("\nperf settings:\n {}\n {}\n", -- 2.39.5