From: Sage Weil <sage@redhat.com>
Date: Thu, 23 Jan 2020 20:14:09 +0000 (-0600)
Subject: mon/ConfigMonitor: put global/ keys in global section
X-Git-Tag: v15.1.0~59^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a41f2594d59504edc852b285f9d735176a9b292d;p=ceph.git

mon/ConfigMonitor: put global/ keys in global section

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/ConfigMonitor.cc b/src/mon/ConfigMonitor.cc
index 0af0acc2a19..9197e221a7c 100644
--- a/src/mon/ConfigMonitor.cc
+++ b/src/mon/ConfigMonitor.cc
@@ -787,7 +787,7 @@ void ConfigMonitor::load_config()
 	pending_cleanup["global/"s + key] = it->value();
       }
       Section *section = &config_map.global;;
-      if (section_name.size()) {
+      if (section_name.size() && section_name != "global") {
 	if (section_name.find('.') != std::string::npos) {
 	  section = &config_map.by_id[section_name];
 	} else {