From: Kefu Chai Date: Thu, 27 Aug 2020 12:58:11 +0000 (+0800) Subject: common/config: make update_legacy_vals() public X-Git-Tag: v16.1.0~1268^2~5 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d7706993cbc8a6786c4402b112ba42e8a4dc3b61;p=ceph.git common/config: make update_legacy_vals() public so crimson can call it in `ConfigProxy::parse_config_files()` after calling `get_config().parse_buffer()`. so the legacy vals are populated with the changes received from conffile. Signed-off-by: Kefu Chai --- diff --git a/src/common/config.h b/src/common/config.h index e71425292b44..a44fab0a4ee5 100644 --- a/src/common/config.h +++ b/src/common/config.h @@ -124,6 +124,7 @@ public: int parse_buffer(ConfigValues& values, const ConfigTracker& tracker, const char* buf, size_t len, std::ostream *warnings); + void update_legacy_vals(ConfigValues& values); // Absorb config settings from the environment void parse_env(unsigned entity_type, ConfigValues& values, const ConfigTracker& tracker, @@ -294,7 +295,6 @@ private: void assign_member(member_ptr_t ptr, const Option::value_t &val); - void update_legacy_vals(ConfigValues& values); void update_legacy_val(ConfigValues& values, const Option &opt, member_ptr_t member);