config: do not accept old-style section names

Stop accepting old-style section names of the form $type$id.  Instead,
we want section names of the form $type.$id.  So [osd0] will no longer
be a valid section name; instead, use [osd.0].

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>

diff --git a/src/common/config.cc b/src/common/config.cc
index 9e60be48173b6cd2cb30332c81d841e0acd63c47..2379aaba3f8279cb99d731854dd41619b922e1db 100644 (file)
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -668,10 +668,6 @@ get_my_sections(std::vector <std::string> &sections)
 {
   sections.push_back(name.to_str());
 
-  std::string alt_name(name.get_type_name());
-  alt_name += name.get_id();
-  sections.push_back(alt_name);
-
   sections.push_back(name.get_type_name());
 
   sections.push_back("global");

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 2470277556f9baf53f69a727e7a4bdab6d09b4e3..7a562956ab9272a60c84bf2aacc97b18b452f9c4 100644 (file)
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -136,9 +136,6 @@ int MonClient::build_initial_monmap()
     m_name += ".";
     m_name += *m;
     sections.push_back(m_name);
-    std::string m_altname("mon");
-    m_altname += *m;
-    sections.push_back(m_altname);
     sections.push_back("mon");
     sections.push_back("global");
     std::string val;

diff --git a/src/test/confutils.cc b/src/test/confutils.cc
index 875fbbcb7fa51f9337f0b4d3fae8d006cf706021..90674b45da70cf75321948b5b4a8ada137859ea3 100644 (file)
--- a/src/test/confutils.cc
+++ b/src/test/confutils.cc
@@ -253,7 +253,7 @@ const char override_config_1[] = "\
         log file =           mds_log\n\
 [osd]\n\
         log file =           osd_log\n\
-[osd0]\n\
+[osd.0]\n\
         log file =           osd0_log\n\
 ";