From 9d817d33d564a4240ba576c378046edee54a599c Mon Sep 17 00:00:00 2001 From: Yingxin Cheng Date: Mon, 10 Jul 2023 15:16:11 +0800 Subject: [PATCH] test/crimson: add missing calls to ConfigProxy::start() Signed-off-by: Yingxin Cheng --- src/crimson/common/config_proxy.h | 2 +- src/test/crimson/test_messenger.cc | 7 +++++-- src/test/crimson/test_messenger_thrash.cc | 7 +++++-- src/test/crimson/test_socket.cc | 7 +++++-- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/crimson/common/config_proxy.h b/src/crimson/common/config_proxy.h index 4013046401879..4c0e655075adb 100644 --- a/src/crimson/common/config_proxy.h +++ b/src/crimson/common/config_proxy.h @@ -105,8 +105,8 @@ public: void get_defaults_bl(ceph::buffer::list *bl) { get_config().get_defaults_bl(get_config_values(), bl); } - // required by sharded<> seastar::future<> start(); + // required by sharded<> seastar::future<> stop() { return seastar::make_ready_future<>(); } diff --git a/src/test/crimson/test_messenger.cc b/src/test/crimson/test_messenger.cc index e597caa2b38a8..6351eedef0a20 100644 --- a/src/test/crimson/test_messenger.cc +++ b/src/test/crimson/test_messenger.cc @@ -3726,8 +3726,11 @@ seastar::future do_test(seastar::app_template& app) CEPH_ENTITY_TYPE_CLIENT, &cluster, &conf_file_list); - return crimson::common::sharded_conf().start(init_params.name, cluster) - .then([conf_file_list] { + return crimson::common::sharded_conf().start( + init_params.name, cluster + ).then([] { + return local_conf().start(); + }).then([conf_file_list] { return local_conf().parse_config_files(conf_file_list); }).then([&app] { auto&& config = app.configuration(); diff --git a/src/test/crimson/test_messenger_thrash.cc b/src/test/crimson/test_messenger_thrash.cc index 22cce30a8094d..f2b1828f1c5a7 100644 --- a/src/test/crimson/test_messenger_thrash.cc +++ b/src/test/crimson/test_messenger_thrash.cc @@ -632,8 +632,11 @@ seastar::future do_test(seastar::app_template& app) CEPH_ENTITY_TYPE_CLIENT, &cluster, &conf_file_list); - return crimson::common::sharded_conf().start(init_params.name, cluster) - .then([conf_file_list] { + return crimson::common::sharded_conf().start( + init_params.name, cluster + ).then([] { + return local_conf().start(); + }).then([conf_file_list] { return local_conf().parse_config_files(conf_file_list); }).then([&app] { auto&& config = app.configuration(); diff --git a/src/test/crimson/test_socket.cc b/src/test/crimson/test_socket.cc index 17052c16d7a1c..2b61196ead8df 100644 --- a/src/test/crimson/test_socket.cc +++ b/src/test/crimson/test_socket.cc @@ -520,8 +520,11 @@ seastar::future do_test(seastar::app_template& app) CEPH_ENTITY_TYPE_CLIENT, &cluster, &conf_file_list); - return crimson::common::sharded_conf().start(init_params.name, cluster - ).then([conf_file_list] { + return crimson::common::sharded_conf().start( + init_params.name, cluster + ).then([] { + return local_conf().start(); + }).then([conf_file_list] { return local_conf().parse_config_files(conf_file_list); }).then([] { return local_conf().set_val("ms_inject_internal_delays", "0"); -- 2.39.5