big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-16925. MetricsConfig incorrectly loads the configuration whose value is String list in the properties file (#1896)

Browse Source 
Contributed by Jiayi Liu
This commit is contained in:
Joey 2020-08-24 21:01:48 +08:00 committed by Steve Loughran
parent 033a8bdc4e
commit ce51048e8c
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java
View File

@ -37,6 +37,7 @@
import org.apache.commons.configuration2.Configuration; import org.apache.commons.configuration2.Configuration;
import org.apache.commons.configuration2.PropertiesConfiguration; import org.apache.commons.configuration2.PropertiesConfiguration;
import org.apache.commons.configuration2.SubsetConfiguration; import org.apache.commons.configuration2.SubsetConfiguration;
import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.commons.configuration2.ex.ConfigurationException;
import org.apache.commons.configuration2.io.FileHandler; import org.apache.commons.configuration2.io.FileHandler;
import org.apache.hadoop.metrics2.MetricsFilter; import org.apache.hadoop.metrics2.MetricsFilter;
@ -111,6 +112,7 @@ static MetricsConfig loadFirst(String prefix, String... fileNames) {
for (String fname : fileNames) { for (String fname : fileNames) {
try { try {
PropertiesConfiguration pcf = new PropertiesConfiguration(); PropertiesConfiguration pcf = new PropertiesConfiguration();
pcf.setListDelimiterHandler(new DefaultListDelimiterHandler(','));
FileHandler fh = new FileHandler(pcf); FileHandler fh = new FileHandler(pcf);
fh.setFileName(fname); fh.setFileName(fname);
fh.load(); fh.load();

16
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsConfig.java
View File

@ -133,6 +133,22 @@ private void testInstances(MetricsConfig c) throws Exception {
assertEq(expected, mc2); assertEq(expected, mc2);
} }
/**
* Test the config value separated by delimiter
*/
@Test public void testDelimiterConf() {
String filename = getTestFilename("test-metrics2-delimiter");
new ConfigBuilder().add("p1.foo", "p1foo1,p1foo2,p1foo3").save(filename);
MetricsConfig mc = MetricsConfig.create("p1", filename);
Configuration expected = new ConfigBuilder()
.add("foo", "p1foo1")
.add("foo", "p1foo2")
.add("foo", "p1foo3")
.config;
assertEq(expected, mc);
}
/** /**
* Return a test filename in the class path * Return a test filename in the class path
* @param basename * @param basename