From: Brad Hubbard <bhubbard@redhat.com>
Date: Tue, 25 Aug 2020 11:07:06 +0000 (+1000)
Subject: common/config: Make sure legacy_values are updated
X-Git-Tag: v16.1.0~1321^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=076c4d752c62276e78129c9a82aa50dfca83c0f0;p=ceph.git

common/config: Make sure legacy_values are updated

Must be updated after final change to 'values'

Fixes: https://tracker.ceph.com/issues/47002

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
---

diff --git a/src/common/config.cc b/src/common/config.cc
index 04e5c54fc57c..129cb344dac5 100644
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -386,6 +386,7 @@ int md_config_t::parse_config_files(ConfigValues& values,
   if (values.cluster.empty()) {
     values.cluster = get_cluster_name(conffile.c_str());
   }
+  update_legacy_vals(values);
   return 0;
 }
 
@@ -418,7 +419,6 @@ md_config_t::parse_buffer(ConfigValues& values,
     }
   }
   cf.check_old_style_section_names({"mds", "mon", "osd"}, cerr);
-  update_legacy_vals(values);
   return 0;
 }