From 4d30f8aeadf518d4006eeefd7edc133f02642f48 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 20 Jan 2020 16:51:18 -0600 Subject: [PATCH] mon/ConfigMonitor: transition old keys to have global/ prefix Convert keys that were missing the global prefix before to now have them. Signed-off-by: Sage Weil --- src/mon/ConfigMonitor.cc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/mon/ConfigMonitor.cc b/src/mon/ConfigMonitor.cc index ab67b3a90fb..0af0acc2a19 100644 --- a/src/mon/ConfigMonitor.cc +++ b/src/mon/ConfigMonitor.cc @@ -779,6 +779,13 @@ void ConfigMonitor::load_config() << dendl; pending_cleanup[key] = boost::none; } else { + if (section_name.empty()) { + // we prefer global/$option instead of just $option + derr << __func__ << " adding global/ prefix to key '" << key << "'" + << dendl; + pending_cleanup[key] = boost::none; + pending_cleanup["global/"s + key] = it->value(); + } Section *section = &config_map.global;; if (section_name.size()) { if (section_name.find('.') != std::string::npos) { -- 2.39.5