]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/common: call config::update_legacy_vals()
authorKefu Chai <kchai@redhat.com>
Thu, 27 Aug 2020 13:00:14 +0000 (21:00 +0800)
committerKefu Chai <kchai@redhat.com>
Mon, 31 Aug 2020 13:13:13 +0000 (21:13 +0800)
so the legacy vals are populated with the changes received from conffile.

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/crimson/common/config_proxy.cc

index 520909d70c43e826505f6116b51687b4ac6bbbcc..a853564038acb06864d18d53c8d4395a666b5c57 100644 (file)
@@ -76,7 +76,11 @@ seastar::future<> ConfigProxy::parse_config_files(const std::string& conf_files)
       }
       return crimson::read_file(*path++).then([this](auto&& buf) {
         return do_change([buf=std::move(buf), this](ConfigValues& values) {
-          if (get_config().parse_buffer(values, obs_mgr, buf.get(), buf.size(), &std::cerr)) {
+          if (get_config().parse_buffer(values, obs_mgr,
+                                        buf.get(), buf.size(),
+                                        &std::cerr) == 0) {
+            get_config().update_legacy_vals(values);
+          } else {
             throw std::invalid_argument("parse error");
           }
         }).then([] {