test/crimson: add missing calls to ConfigProxy::start()

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
(cherry picked from commit 9d817d33d564a4240ba576c378046edee54a599c)

diff --git a/src/crimson/common/config_proxy.h b/src/crimson/common/config_proxy.h
index 40130464018797836c4e1af77b6964cd309e1c35..4c0e655075adb92f1ffc5cd5879dd5b99bf0fc18 100644 (file)
--- 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 e597caa2b38a8d1e5f0f7df4fe961162b701c391..6351eedef0a2006307c0359ec41009ddd078f52d 100644 (file)
--- a/src/test/crimson/test_messenger.cc
+++ b/src/test/crimson/test_messenger.cc
@@ -3726,8 +3726,11 @@ seastar::future<int> 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 22cce30a8094d6e6f64b20d4071a3364214e70e2..f2b1828f1c5a715d896bccaa2695ec198a861b7c 100644 (file)
--- a/src/test/crimson/test_messenger_thrash.cc
+++ b/src/test/crimson/test_messenger_thrash.cc
@@ -632,8 +632,11 @@ seastar::future<int> 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 17052c16d7a1c67f6a3a4dad80cdbc5b1698cd98..2b61196ead8dfd6ef364d97ea399af88f147c55a 100644 (file)
--- a/src/test/crimson/test_socket.cc
+++ b/src/test/crimson/test_socket.cc
@@ -520,8 +520,11 @@ seastar::future<int> 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");