]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/ConfigMonitor: put global/ keys in global section 32856/head
authorSage Weil <sage@redhat.com>
Thu, 23 Jan 2020 20:14:09 +0000 (14:14 -0600)
committerzhengyin <zhengyin@cmss.chinamobile.com>
Mon, 27 Jan 2020 13:50:21 +0000 (21:50 +0800)
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit a41f2594d59504edc852b285f9d735176a9b292d)

src/mon/ConfigMonitor.cc

index b1f670f4cd94160a592d80c2d53a6df4b150e4a6..5b0599a64daa1248d3707c10852c2888ab25a580 100644 (file)
@@ -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 {