Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-11912. Extra configuration key used in TraceUtils should respect prefix (Masatake Iwasaki via Colin P. McCabe) 

(cherry picked from commit 90b3845648)
This commit is contained in:
Colin Patrick Mccabe 2015-05-05 17:40:31 -07:00
parent b8e4507637
commit 606e4f4940
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -162,6 +162,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-11926. test-patch.sh mv does wrong math (aw) HADOOP-11926. test-patch.sh mv does wrong math (aw)
HADOOP-11912. Extra configuration key used in TraceUtils should respect
prefix (Masatake Iwasaki via Colin P. McCabe)
Release 2.7.1 - UNRELEASED Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

12
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tracing/TraceUtils.java
View File

@ -47,18 +47,16 @@ public static HTraceConfiguration wrapHadoopConf(final String prefix,
return new HTraceConfiguration() { return new HTraceConfiguration() {
@Override @Override
public String get(String key) { public String get(String key) {
if (extraMap.containsKey(key)) { return get(key, "");
return extraMap.get(key);
}
return conf.get(prefix + key, "");
} }
@Override @Override
public String get(String key, String defaultValue) { public String get(String key, String defaultValue) {
if (extraMap.containsKey(key)) { String prefixedKey = prefix + key;
return extraMap.get(key); if (extraMap.containsKey(prefixedKey)) {
return extraMap.get(prefixedKey);
} }
return conf.get(prefix + key, defaultValue); return conf.get(prefixedKey, defaultValue);
} }
}; };
} }

2
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/tracing/TestTraceUtils.java
View File

@ -46,7 +46,7 @@ public void testExtraConfig() {
conf.set(TEST_PREFIX + key, oldValue); conf.set(TEST_PREFIX + key, oldValue);
LinkedList<ConfigurationPair> extraConfig = LinkedList<ConfigurationPair> extraConfig =
new LinkedList<ConfigurationPair>(); new LinkedList<ConfigurationPair>();
extraConfig.add(new ConfigurationPair(key, newValue)); extraConfig.add(new ConfigurationPair(TEST_PREFIX + key, newValue));
HTraceConfiguration wrapped = TraceUtils.wrapHadoopConf(TEST_PREFIX, conf, extraConfig); HTraceConfiguration wrapped = TraceUtils.wrapHadoopConf(TEST_PREFIX, conf, extraConfig);
assertEquals(newValue, wrapped.get(key)); assertEquals(newValue, wrapped.get(key));
} }