From a5244f7c6765cde4bb2584546488de0029258a33 Mon Sep 17 00:00:00 2001 From: John Spray Date: Wed, 5 Jul 2017 07:18:30 -0400 Subject: [PATCH] common: s/config_opts/legacy_config_opts/ Name change reflects that newly added config opts don't need to go here. Signed-off-by: John Spray --- src/ceph_mon.cc | 6 +++--- src/common/config.cc | 8 ++++---- src/common/config.h | 4 ++-- src/convert.cc | 2 +- src/include/rados/librados.h | 2 +- src/pybind/CMakeLists.txt | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc index 400c8989545..3663bb04e4b 100644 --- a/src/ceph_mon.cc +++ b/src/ceph_mon.cc @@ -203,10 +203,10 @@ int main(int argc, const char **argv) // We need to specify some default values that may be overridden by the // user, that are specific to the monitor. The options we are overriding // are also used on the OSD (or in any other component that uses leveldb), - // so changing them directly in common/config_opts.h is not an option. + // so changing the global defaults is not an option. // This is not the prettiest way of doing this, especially since it has us - // having a different place than common/config_opts.h defining default - // values, but it's not horribly wrong enough to prevent us from doing it :) + // having a different place defining default values, but it's not horribly + // wrong enough to prevent us from doing it :) // // NOTE: user-defined options will take precedence over ours. // diff --git a/src/common/config.cc b/src/common/config.cc index 5cbbd85e97b..3df1d71fafe 100644 --- a/src/common/config.cc +++ b/src/common/config.cc @@ -81,7 +81,7 @@ struct md_config_t::option_##name##_t { \ #define SAFE_OPTION(name, type, def_val) #define SUBSYS(name, log, gather) #define DEFAULT_SUBSYS(log, gather) -#include "common/config_opts.h" +#include "common/legacy_config_opts.h" #undef OPTION #undef OPTION_VALIDATOR #undef SAFE_OPTION @@ -127,7 +127,7 @@ md_config_t::md_config_t() #define SAFE_OPTION(name, type, def_val) OPTION(name, type, def_val) #define SUBSYS(name, log, gather) #define DEFAULT_SUBSYS(log, gather) -#include "common/config_opts.h" +#include "common/legacy_config_opts.h" #undef OPTION_OPT_INT #undef OPTION_OPT_LONGLONG #undef OPTION_OPT_STR @@ -154,7 +154,7 @@ md_config_t::md_config_t() #define SAFE_OPTION(name, type, def_val) OPTION4(name, type, def_val, true) #define SUBSYS(name, log, gather) #define DEFAULT_SUBSYS(log, gather) -#include "common/config_opts.h" +#include "common/legacy_config_opts.h" #undef OPTION4 #undef OPTION #undef OPTION_VALIDATOR @@ -179,7 +179,7 @@ void md_config_t::init_subsys() #define OPTION(a, b, c) #define OPTION_VALIDATOR(a) #define SAFE_OPTION(a, b, c) -#include "common/config_opts.h" +#include "common/legacy_config_opts.h" #undef OPTION #undef OPTION_VALIDATOR #undef SAFE_OPTION diff --git a/src/common/config.h b/src/common/config.h index 0d32fb3b90c..0f8f8b1a0f3 100644 --- a/src/common/config.h +++ b/src/common/config.h @@ -323,7 +323,7 @@ public: struct option_##name##_t; #define SUBSYS(name, log, gather) #define DEFAULT_SUBSYS(log, gather) -#include "common/config_opts.h" +#include "common/legacy_config_opts.h" #undef OPTION_OPT_INT #undef OPTION_OPT_LONGLONG #undef OPTION_OPT_STR @@ -398,7 +398,7 @@ enum config_subsys_id { #define SUBSYS(name, log, gather) \ ceph_subsys_##name, #define DEFAULT_SUBSYS(log, gather) -#include "common/config_opts.h" +#include "common/legacy_config_opts.h" #undef SUBSYS #undef OPTION #undef OPTION_VALIDATOR diff --git a/src/convert.cc b/src/convert.cc index ab4346aa856..3d716e8c9a6 100644 --- a/src/convert.cc +++ b/src/convert.cc @@ -47,5 +47,5 @@ string convert_type(string t) { int main(int argc, char **argv) { - #include "common/config_opts.h" + #include "common/legacy_config_opts.h" } diff --git a/src/include/rados/librados.h b/src/include/rados/librados.h index 9d427ebcd17..076b163f81c 100644 --- a/src/include/rados/librados.h +++ b/src/include/rados/librados.h @@ -491,7 +491,7 @@ CEPH_RADOS_API void rados_shutdown(rados_t cluster); * - log_file, log_to_stderr, err_to_stderr, and log_to_syslog * - debug_rados, debug_objecter, debug_monc, debug_auth, or debug_ms * - * All possible options can be found in src/common/config_opts.h in ceph.git + * See docs.ceph.com for information about available configuration options` * * @{ */ diff --git a/src/pybind/CMakeLists.txt b/src/pybind/CMakeLists.txt index baae8f6f3ea..dbdb23f1c56 100644 --- a/src/pybind/CMakeLists.txt +++ b/src/pybind/CMakeLists.txt @@ -61,7 +61,7 @@ install(FILES DESTINATION ${PYTHON_INSTDIR}) if(WITH_MGR) - # Needs to match src/common/config_opts.h, which has: + # Location needs to match default setting for mgr_module_path, currently: # OPTION(mgr_module_path, OPT_STR, CEPH_PKGLIBDIR "/mgr") install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/mgr -- 2.39.5