]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
test/crimson: avoid using variadic future
authorKefu Chai <kchai@redhat.com>
Sun, 7 Jun 2020 04:16:55 +0000 (12:16 +0800)
committerKefu Chai <kchai@redhat.com>
Mon, 8 Jun 2020 03:17:33 +0000 (11:17 +0800)
see also 3cee25ba41069e9e9b4855f99be20910759440ca

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/tools/crimson/perf_crimson_msgr.cc

index 7ed27dd744c79371b50cf7fd83f23534d27868eb..70335c444765fed18acb88fa69bb54bdc8dfddce 100644 (file)
@@ -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<test_state::Client>(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",