common/options,ceph_test_msgr: unmark misc ms options as RUNTIME

These were marked RUNTIME for the benefit of the test.  Replace with a
no-op observer.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/common/options.cc b/src/common/options.cc
index f4cace82d4f72502fa9a518cd5760cdc725c08cb..2e87d7061a464ca51a119d234de7f97139173410 100644 (file)
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -762,8 +762,7 @@ std::vector<Option> get_global_options() {
 
     Option("ms_type", Option::TYPE_STR, Option::LEVEL_ADVANCED)
     .set_default("async+posix")
-    .set_description("")
-    .set_flag(Option::FLAG_RUNTIME),  // why?
+    .set_description(""),
 
     Option("ms_public_type", Option::TYPE_STR, Option::LEVEL_ADVANCED)
     .set_default("")
@@ -980,7 +979,6 @@ std::vector<Option> get_global_options() {
     Option("ms_dpdk_coremask", Option::TYPE_STR, Option::LEVEL_ADVANCED)
     .set_default("0xF")         //begin with 0x for the string
     .set_description("")
-    .set_flag(Option::FLAG_RUNTIME)
     .add_see_also("ms_async_op_threads"),
 
     Option("ms_dpdk_memory_channel", Option::TYPE_STR, Option::LEVEL_ADVANCED)
@@ -997,18 +995,15 @@ std::vector<Option> get_global_options() {
 
     Option("ms_dpdk_host_ipv4_addr", Option::TYPE_STR, Option::LEVEL_ADVANCED)
     .set_default("")
-    .set_description("")
-    .set_flag(Option::FLAG_RUNTIME),
+    .set_description(""),
 
     Option("ms_dpdk_gateway_ipv4_addr", Option::TYPE_STR, Option::LEVEL_ADVANCED)
     .set_default("")
-    .set_description("")
-    .set_flag(Option::FLAG_RUNTIME),
+    .set_description(""),
 
     Option("ms_dpdk_netmask_ipv4_addr", Option::TYPE_STR, Option::LEVEL_ADVANCED)
     .set_default("")
-    .set_description("")
-    .set_flag(Option::FLAG_RUNTIME),
+    .set_description(""),
 
     Option("ms_dpdk_lro", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
     .set_default(true)

diff --git a/src/test/msgr/test_async_networkstack.cc b/src/test/msgr/test_async_networkstack.cc
index 59510ca8c6af22e35bdef3cce72a7b7968b0b6c1..01be5b5d107cb91ab16ba336cb9e33d7b910adc5 100644 (file)
--- a/src/test/msgr/test_async_networkstack.cc
+++ b/src/test/msgr/test_async_networkstack.cc
@@ -37,6 +37,12 @@ class NetworkWorkerTest : public ::testing::TestWithParam<const char*> {
   std::shared_ptr<NetworkStack> stack;
   string addr, port_addr;
 
+  NoopConfigObserver fake_obs = {{"ms_type",
+                                "ms_dpdk_coremask",
+                                "ms_dpdk_host_ipv4_addr",
+                                "ms_dpdk_gateway_ipv4_addr",
+                                "ms_dpdk_netmask_ipv4_addr"}};
+
   NetworkWorkerTest() {}
   void SetUp() override {
     cerr << __func__ << " start set up " << GetParam() << std::endl;
@@ -45,13 +51,13 @@ class NetworkWorkerTest : public ::testing::TestWithParam<const char*> {
       addr = "127.0.0.1:15000";
       port_addr = "127.0.0.1:15001";
     } else {
-      g_ceph_context->_conf->set_val("ms_type", "async+dpdk");
-      g_ceph_context->_conf->set_val("ms_dpdk_debug_allow_loopback", "true");
-      g_ceph_context->_conf->set_val("ms_async_op_threads", "2");
-      g_ceph_context->_conf->set_val("ms_dpdk_coremask", "0x7");
-      g_ceph_context->_conf->set_val("ms_dpdk_host_ipv4_addr", "172.16.218.3");
-      g_ceph_context->_conf->set_val("ms_dpdk_gateway_ipv4_addr", "172.16.218.2");
-      g_ceph_context->_conf->set_val("ms_dpdk_netmask_ipv4_addr", "255.255.255.0");
+      g_ceph_context->_conf->set_val_or_die("ms_type", "async+dpdk");
+      g_ceph_context->_conf->set_val_or_die("ms_dpdk_debug_allow_loopback", "true");
+      g_ceph_context->_conf->set_val_or_die("ms_async_op_threads", "2");
+      g_ceph_context->_conf->set_val_or_die("ms_dpdk_coremask", "0x7");
+      g_ceph_context->_conf->set_val_or_die("ms_dpdk_host_ipv4_addr", "172.16.218.3");
+      g_ceph_context->_conf->set_val_or_die("ms_dpdk_gateway_ipv4_addr", "172.16.218.2");
+      g_ceph_context->_conf->set_val_or_die("ms_dpdk_netmask_ipv4_addr", "255.255.255.0");
       addr = "172.16.218.3:15000";
       port_addr = "172.16.218.3:15001";
     }