You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by tu...@apache.org on 2012/03/22 17:49:24 UTC
svn commit: r1303886 - in
/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common:
CHANGES.txt src/main/java/org/apache/hadoop/conf/Configuration.java
src/test/java/org/apache/hadoop/conf/TestDeprecatedKeys.java
Author: tucu
Date: Thu Mar 22 16:49:24 2012
New Revision: 1303886
URL: http://svn.apache.org/viewvc?rev=1303886&view=rev
Log:
Merge -r 1303883:1303884 from trunk to branch. FIXES: HADOOP-8197
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestDeprecatedKeys.java
Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1303886&r1=1303885&r2=1303886&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Thu Mar 22 16:49:24 2012
@@ -152,6 +152,8 @@ Release 0.23.3 - UNRELEASED
HADOOP-8157. Fix race condition in Configuration that could cause spurious
ClassNotFoundExceptions after a GC. (todd)
+ HADOOP-8197. Configuration logs WARNs on every use of a deprecated key (tucu)
+
BREAKDOWN OF HADOOP-7454 SUBTASKS
HADOOP-7455. HA: Introduce HA Service Protocol Interface. (suresh)
Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java?rev=1303886&r1=1303885&r2=1303886&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java Thu Mar 22 16:49:24 2012
@@ -347,9 +347,7 @@ public class Configuration implements It
private String handleDeprecation(String name) {
if (isDeprecated(name)) {
DeprecatedKeyInfo keyInfo = deprecatedKeyMap.get(name);
- if (!keyInfo.accessed) {
- LOG.warn(keyInfo.getWarningMessage(name));
- }
+ warnOnceIfDeprecated(name);
for (String newKey : keyInfo.newKeys) {
if(newKey != null) {
name = newKey;
@@ -362,11 +360,6 @@ public class Configuration implements It
getOverlay().containsKey(deprecatedKey)) {
getProps().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;
}
@@ -662,12 +655,16 @@ public class Configuration implements It
getOverlay().setProperty(altName, value);
getProps().setProperty(altName, value);
}
- if (isDeprecated(name)) {
- DeprecatedKeyInfo keyInfo = deprecatedKeyMap.get(name);
+ warnOnceIfDeprecated(name);
+ }
+
+ private void warnOnceIfDeprecated(String name) {
+ DeprecatedKeyInfo keyInfo = deprecatedKeyMap.get(name);
+ if (keyInfo != null && !keyInfo.accessed) {
LOG.warn(keyInfo.getWarningMessage(name));
}
}
-
+
/**
* Unset a previously set property.
*/
Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestDeprecatedKeys.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestDeprecatedKeys.java?rev=1303886&r1=1303885&r2=1303886&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestDeprecatedKeys.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestDeprecatedKeys.java Thu Mar 22 16:49:24 2012
@@ -31,6 +31,7 @@ public class TestDeprecatedKeys extends
public void testDeprecatedKeys() throws Exception {
Configuration conf = new Configuration();
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);
assertTrue(scriptFile.equals("xyz")) ;
}