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 su...@apache.org on 2011/06/01 23:15:10 UTC
svn commit: r1130306 - in /hadoop/common/branches/branch-0.22: ./ src/docs/
src/java/ src/java/org/apache/hadoop/conf/ src/test/core/
src/test/core/org/apache/hadoop/conf/ src/test/core/org/apache/hadoop/io/
Author: suresh
Date: Wed Jun 1 21:15:10 2011
New Revision: 1130306
URL: http://svn.apache.org/viewvc?rev=1130306&view=rev
Log:
Merging changes r1038493 and r1038480 for HADOOP-7001 from trunk
Added:
hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/conf/Reconfigurable.java
- copied unchanged from r1038493, hadoop/common/trunk/src/java/org/apache/hadoop/conf/Reconfigurable.java
hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/conf/ReconfigurableBase.java
- copied unchanged from r1038480, hadoop/common/trunk/src/java/org/apache/hadoop/conf/ReconfigurableBase.java
hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/conf/ReconfigurationException.java
- copied unchanged from r1038480, hadoop/common/trunk/src/java/org/apache/hadoop/conf/ReconfigurationException.java
hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/conf/ReconfigurationServlet.java
- copied unchanged from r1038480, hadoop/common/trunk/src/java/org/apache/hadoop/conf/ReconfigurationServlet.java
hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/conf/ReconfigurationUtil.java
- copied unchanged from r1038480, hadoop/common/trunk/src/java/org/apache/hadoop/conf/ReconfigurationUtil.java
hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/conf/TestReconfiguration.java
- copied unchanged from r1038480, hadoop/common/trunk/src/test/core/org/apache/hadoop/conf/TestReconfiguration.java
Modified:
hadoop/common/branches/branch-0.22/ (props changed)
hadoop/common/branches/branch-0.22/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-0.22/src/docs/ (props changed)
hadoop/common/branches/branch-0.22/src/java/ (props changed)
hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/conf/Configuration.java
hadoop/common/branches/branch-0.22/src/test/core/ (props changed)
hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/io/TestSequenceFile.java (props changed)
Propchange: hadoop/common/branches/branch-0.22/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 1 21:15:10 2011
@@ -1,2 +1,2 @@
-/hadoop/common/trunk:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056,1102914,1103931,1124456,1126287
+/hadoop/common/trunk:1037901,1038480,1038493,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056,1102914,1103931,1124456,1126287
/hadoop/core/branches/branch-0.19/core:713112
Modified: hadoop/common/branches/branch-0.22/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/CHANGES.txt?rev=1130306&r1=1130305&r2=1130306&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/CHANGES.txt Wed Jun 1 21:15:10 2011
@@ -51,6 +51,9 @@ Release 0.22.0 - Unreleased
IMPROVEMENTS
+ HADOOP-7001. Configuration changes can occur via the Reconfigurable
+ interface. (Patrick Kline via dhruba)
+
HADOOP-6644. util.Shell getGROUPS_FOR_USER_COMMAND method name
- should use common naming convention (boryas)
Propchange: hadoop/common/branches/branch-0.22/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 1 21:15:10 2011
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/CHANGES.txt:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056,1102914,1103931,1124456,1126287
+/hadoop/common/trunk/CHANGES.txt:1037901,1038480,1038493,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056,1102914,1103931,1124456,1126287
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:776175-785643,785929-786278
Propchange: hadoop/common/branches/branch-0.22/src/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 1 21:15:10 2011
@@ -1,2 +1,2 @@
-/hadoop/common/trunk/src/docs:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056,1102914,1103931,1124456,1126287
+/hadoop/common/trunk/src/docs:1037901,1038480,1038493,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056,1102914,1103931,1124456,1126287
/hadoop/core/branches/branch-0.19/src/docs:713112
Propchange: hadoop/common/branches/branch-0.22/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 1 21:15:10 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/java:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056,1102914,1103931,1124456,1126287
+/hadoop/common/trunk/src/java:1037901,1038480,1038493,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056,1102914,1103931,1124456,1126287
/hadoop/core/branches/branch-0.19/core/src/java:713112
/hadoop/core/trunk/src/core:776175-785643,785929-786278
Modified: hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/conf/Configuration.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/conf/Configuration.java?rev=1130306&r1=1130305&r2=1130306&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/conf/Configuration.java (original)
+++ hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/conf/Configuration.java Wed Jun 1 21:15:10 2011
@@ -635,11 +635,21 @@ public class Configuration implements It
}
/**
+ * Unset a previously set property.
+ */
+ public synchronized void unset(String name) {
+ name = handleDeprecation(name);
+
+ getOverlay().remove(name);
+ getProps().remove(name);
+ }
+
+ /**
* Sets a property if it is currently unset.
* @param name the property name
* @param value the new value
*/
- public void setIfUnset(String name, String value) {
+ public synchronized void setIfUnset(String name, String value) {
if (get(name) == null) {
set(name, value);
}
Propchange: hadoop/common/branches/branch-0.22/src/test/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 1 21:15:10 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/test/core:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056,1102914,1103931,1124456,1126287
+/hadoop/common/trunk/src/test/core:1037901,1038480,1038493,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056,1102914,1103931,1124456,1126287
/hadoop/core/branches/branch-0.19/core/src/test/core:713112
/hadoop/core/trunk/src/test/core:776175-785643,785929-786278
Propchange: hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/io/TestSequenceFile.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 1 21:15:10 2011
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/test/core/org/apache/hadoop/io/TestSequenceFile.java:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056,1102914,1103931,1124456,1126287
+/hadoop/common/trunk/src/test/core/org/apache/hadoop/io/TestSequenceFile.java:1037901,1038480,1038493,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056,1102914,1103931,1124456,1126287
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/io/TestSequenceFile.java:713112
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFile.java:776175-785643