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

Merge -r 1303883:1303884 from trunk to branch. FIXES: HADOOP-8197 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1303886 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Alejandro Abdelnur 2012-03-22 16:49:24 +00:00
parent ef328827eb
commit 05dd1905a3
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -152,6 +152,8 @@ Release 0.23.3 - UNRELEASED
HADOOP-8157. Fix race condition in Configuration that could cause spurious HADOOP-8157. Fix race condition in Configuration that could cause spurious
ClassNotFoundExceptions after a GC. (todd) ClassNotFoundExceptions after a GC. (todd)
HADOOP-8197. Configuration logs WARNs on every use of a deprecated key (tucu)
BREAKDOWN OF HADOOP-7454 SUBTASKS BREAKDOWN OF HADOOP-7454 SUBTASKS
HADOOP-7455. HA: Introduce HA Service Protocol Interface. (suresh) HADOOP-7455. HA: Introduce HA Service Protocol Interface. (suresh)

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

@ -347,9 +347,7 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
private String handleDeprecation(String name) { private String handleDeprecation(String name) {
if (isDeprecated(name)) { if (isDeprecated(name)) {
DeprecatedKeyInfo keyInfo = deprecatedKeyMap.get(name); DeprecatedKeyInfo keyInfo = deprecatedKeyMap.get(name);
if (!keyInfo.accessed) { warnOnceIfDeprecated(name);
LOG.warn(keyInfo.getWarningMessage(name));
}
for (String newKey : keyInfo.newKeys) { for (String newKey : keyInfo.newKeys) {
if(newKey != null) { if(newKey != null) {
name = newKey; name = newKey;
@ -362,11 +360,6 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
getOverlay().containsKey(deprecatedKey)) { getOverlay().containsKey(deprecatedKey)) {
getProps().setProperty(name, getOverlay().getProperty(deprecatedKey)); getProps().setProperty(name, getOverlay().getProperty(deprecatedKey));
getOverlay().setProperty(name, getOverlay().getProperty(deprecatedKey)); getOverlay().setProperty(name, getOverlay().getProperty(deprecatedKey));
DeprecatedKeyInfo keyInfo = deprecatedKeyMap.get(deprecatedKey);
if (!keyInfo.accessed) {
LOG.warn(keyInfo.getWarningMessage(deprecatedKey));
}
} }
return name; return name;
} }
@ -662,12 +655,16 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
getOverlay().setProperty(altName, value); getOverlay().setProperty(altName, value);
getProps().setProperty(altName, value); getProps().setProperty(altName, value);
} }
if (isDeprecated(name)) { warnOnceIfDeprecated(name);
DeprecatedKeyInfo keyInfo = deprecatedKeyMap.get(name); }
private void warnOnceIfDeprecated(String name) {
DeprecatedKeyInfo keyInfo = deprecatedKeyMap.get(name);
if (keyInfo != null && !keyInfo.accessed) {
LOG.warn(keyInfo.getWarningMessage(name)); LOG.warn(keyInfo.getWarningMessage(name));
} }
} }
/** /**
* Unset a previously set property. * Unset a previously set property.
*/ */

1
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestDeprecatedKeys.java
View File

@ -31,6 +31,7 @@ public class TestDeprecatedKeys extends TestCase {
public void testDeprecatedKeys() throws Exception { public void testDeprecatedKeys() throws Exception {
Configuration conf = new Configuration(); Configuration conf = new Configuration();
conf.set("topology.script.file.name", "xyz"); conf.set("topology.script.file.name", "xyz");
conf.set("topology.script.file.name", "xyz");
String scriptFile = conf.get(CommonConfigurationKeys.NET_TOPOLOGY_SCRIPT_FILE_NAME_KEY); String scriptFile = conf.get(CommonConfigurationKeys.NET_TOPOLOGY_SCRIPT_FILE_NAME_KEY);
assertTrue(scriptFile.equals("xyz")) ; assertTrue(scriptFile.equals("xyz")) ;
} }