]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/ConfigMonitor: put global/ keys in global section 32786/head
authorSage Weil <sage@redhat.com>
Thu, 23 Jan 2020 20:14:09 +0000 (14:14 -0600)
committerSage Weil <sage@redhat.com>
Thu, 23 Jan 2020 20:14:09 +0000 (14:14 -0600)
Signed-off-by: Sage Weil <sage@redhat.com>
src/mon/ConfigMonitor.cc

index 0af0acc2a19b52817e1bdf3074cea519baf6fa8f..9197e221a7c213b26294408270212fd42bdebf12 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 {