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

HADOOP-6871. When the value of a configuration key is set to its unresolved form, it causes an IllegalStateException in Configuration.get() stating that substitution depth is too large. Contributed by Arvind Prabhakar (harsh)

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1342626 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Harsh J 2012-05-25 14:02:01 +00:00
parent 2ebb1f47db
commit 4709160d75
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,6 +153,11 @@ Trunk (unreleased changes)
HADOOP-8413. test-patch.sh gives out the wrong links for
newPatchFindbugsWarnings (Colin Patrick McCabe via bobby)
HADOOP-6871. When the value of a configuration key is set to its
unresolved form, it causes the IllegalStateException in
Configuration.get() stating that substitution depth is too large.
(Arvind Prabhakar via harsh)
OPTIMIZATIONS
HADOOP-7761. Improve the performance of raw comparisons. (todd)

6
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
View File

@ -617,7 +617,13 @@ private String substituteVars(String expr) {
}
Matcher match = varPat.matcher("");
String eval = expr;
Set<String> evalSet = new HashSet<String>();
for(int s=0; s<MAX_SUBST; s++) {
if (evalSet.contains(eval)) {
// Cyclic resolution pattern detected. Return current expression.
return eval;
}
evalSet.add(eval);
match.reset(eval);
if (!match.find()) {
return eval;

9
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java
View File

@ -999,6 +999,15 @@ public void testGetClassesShouldReturnEmptyArray()
"Not returning expected number of classes. Number of returned classes ="
+ classes.length, 0, classes.length);
}
public void testInvalidSubstitutation() {
String key = "test.random.key";
String keyExpression = "${" + key + "}";
Configuration configuration = new Configuration();
configuration.set(key, keyExpression);
String value = configuration.get(key);
assertTrue("Unexpected value " + value, value.equals(keyExpression));
}
public static void main(String[] argv) throws Exception {
junit.textui.TestRunner.main(new String[]{