From a0a5ea4e3f0986f01e109a71a2573cce646e3470 Mon Sep 17 00:00:00 2001 From: Colin Patrick McCabe Date: Fri, 15 Apr 2011 13:59:57 -0700 Subject: [PATCH] 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 --- src/common/config.cc | 4 ---- src/mon/MonClient.cc | 3 --- src/test/confutils.cc | 2 +- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/common/config.cc b/src/common/config.cc index 9e60be48173b6..2379aaba3f827 100644 --- a/src/common/config.cc +++ b/src/common/config.cc @@ -668,10 +668,6 @@ get_my_sections(std::vector §ions) { 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 2470277556f9b..7a562956ab927 100644 --- 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 875fbbcb7fa51..90674b45da70c 100644 --- 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\ "; -- 2.39.5