From: Kefu Chai Date: Fri, 23 Apr 2021 09:32:00 +0000 (+0800) Subject: common/options: extract osd and mgr settings out X-Git-Tag: v17.1.0~1968^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3478fdca3693582ee6e54a9ee3fe6b720322183c;p=ceph.git common/options: extract osd and mgr settings out the purposes of this change are: * faster compilation, so the cmake generator can process .yaml.in files in parallel. * allow daemons to include a subset of options which it is interested in. * better maintainability. by grouping options in different .yaml.in files, developers understand who are the consumers of an option. in this change, options only read by mgr are extracted into mgr.yaml.in, and options only read by osd are extracted into osd.yaml.in. so all options in mgr.yaml.in should have "services: mgr" in their definition by default. the ones in osd.yaml.in have "services: osd". in the case where options are consumed by multiple services or tools, the option should add "common" to its "services" if it is supposed to be consumed by a tool, or "mon" if it is read by monitor as well. but it takes time to audit all the options, so only part of them are processed. Signed-off-by: Kefu Chai --- diff --git a/src/common/options/CMakeLists.txt b/src/common/options/CMakeLists.txt index 6424271e3812..8705c31fdc83 100644 --- a/src/common/options/CMakeLists.txt +++ b/src/common/options/CMakeLists.txt @@ -82,8 +82,10 @@ endif() add_options(global) add_options(cephfs-mirror) add_options(crimson) +add_options(mgr) add_options(mds) add_options(mds-client) +add_options(osd) add_options(rbd) add_options(rbd-mirror) add_options(immutable-object-cache) diff --git a/src/common/options/build_options.cc b/src/common/options/build_options.cc index cf3f5ef6c92d..ec3a1f9ecda8 100644 --- a/src/common/options/build_options.cc +++ b/src/common/options/build_options.cc @@ -4,7 +4,9 @@ #include "build_options.h" std::vector