From: Sage Weil <sage@redhat.com>
Date: Fri, 26 Apr 2019 15:42:52 +0000 (-0500)
Subject: common/options: flag misc ms_* options STARTUP
X-Git-Tag: v14.2.2~107^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=46804d28b455dcc92291454b8335a46dfd1b9da8;p=ceph.git

common/options: flag misc ms_* options STARTUP

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit de92bc877e270a07e6d202f976136478f681fe5c)

# Conflicts:
#	src/common/options.cc
 - master as 'crc secure' for a bunch fo options, but that isn't
   backported yet
---

diff --git a/src/common/options.cc b/src/common/options.cc
index 94a001e37895..d0dd577fa077 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -886,23 +886,27 @@ std::vector<Option> get_global_options() {
     .set_long_description("If enabled, collect and expose internal health metrics"),
 
     Option("ms_type", Option::TYPE_STR, Option::LEVEL_ADVANCED)
+    .set_flag(Option::FLAG_STARTUP)
     .set_default("async+posix")
     .set_description("Messenger implementation to use for network communication"),
 
     Option("ms_public_type", Option::TYPE_STR, Option::LEVEL_ADVANCED)
     .set_default("")
+    .set_flag(Option::FLAG_STARTUP)
     .set_description("Messenger implementation to use for the public network")
     .set_long_description("If not specified, use ms_type")
     .add_see_also("ms_type"),
 
     Option("ms_cluster_type", Option::TYPE_STR, Option::LEVEL_ADVANCED)
     .set_default("")
+    .set_flag(Option::FLAG_STARTUP)
     .set_description("Messenger implementation to use for the internal cluster network")
     .set_long_description("If not specified, use ms_type")
     .add_see_also("ms_type"),
 
     Option("ms_mon_cluster_mode", Option::TYPE_STR, Option::LEVEL_BASIC)
     .set_default("crc")
+    .set_flag(Option::FLAG_STARTUP)
     .set_description("Connection modes (crc, secure) for intra-mon connections in order of preference")
     .add_see_also("ms_mon_service_mode")
     .add_see_also("ms_mon_client_mode")
@@ -912,6 +916,7 @@ std::vector<Option> get_global_options() {
 
     Option("ms_mon_service_mode", Option::TYPE_STR, Option::LEVEL_BASIC)
     .set_default("crc")
+    .set_flag(Option::FLAG_STARTUP)
     .set_description("Allowed connection modes (crc, secure) for connections to mons")
     .add_see_also("ms_service_mode")
     .add_see_also("ms_mon_cluster_mode")
@@ -921,6 +926,7 @@ std::vector<Option> get_global_options() {
 
     Option("ms_mon_client_mode", Option::TYPE_STR, Option::LEVEL_BASIC)
     .set_default("crc")
+    .set_flag(Option::FLAG_STARTUP)
     .set_description("Connection modes (crc, secure) for connections from clients to monitors in order of preference")
     .add_see_also("ms_mon_service_mode")
     .add_see_also("ms_mon_cluster_mode")
@@ -930,18 +936,21 @@ std::vector<Option> get_global_options() {
 
     Option("ms_cluster_mode", Option::TYPE_STR, Option::LEVEL_BASIC)
     .set_default("crc")
+    .set_flag(Option::FLAG_STARTUP)
     .set_description("Connection modes (crc, secure) for intra-cluster connections in order of preference")
     .add_see_also("ms_service_mode")
     .add_see_also("ms_client_mode"),
 
     Option("ms_service_mode", Option::TYPE_STR, Option::LEVEL_BASIC)
     .set_default("crc")
+    .set_flag(Option::FLAG_STARTUP)
     .set_description("Allowed connection modes (crc, secure) for connections to daemons")
     .add_see_also("ms_cluster_mode")
     .add_see_also("ms_client_mode"),
 
     Option("ms_client_mode", Option::TYPE_STR, Option::LEVEL_BASIC)
     .set_default("crc")
+    .set_flag(Option::FLAG_STARTUP)
     .set_description("Connection modes (crc, secure) for connections from clients in order of preference")
     .add_see_also("ms_cluster_mode")
     .add_see_also("ms_service_mode"),