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 at...@apache.org on 2012/01/06 19:47:09 UTC
svn commit: r1228339 - in
/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common: ./
src/main/docs/ src/main/java/ src/main/java/org/apache/hadoop/conf/
src/main/java/org/apache/hadoop/io/ src/main/java/org/apache/hadoop/tools/
src/test/...
Author: atm
Date: Fri Jan 6 18:47:05 2012
New Revision: 1228339
URL: http://svn.apache.org/viewvc?rev=1228339&view=rev
Log:
Merge trunk into HA branch.
Modified:
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt (contents, props changed)
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/docs/ (props changed)
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/ (props changed)
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tools/GetGroupsBase.java
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/core/ (props changed)
hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java
Modified: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1228339&r1=1228338&r2=1228339&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt Fri Jan 6 18:47:05 2012
@@ -46,16 +46,9 @@ Trunk (unreleased changes)
if the override value is same as the final parameter value.
(Ravi Prakash via suresh)
- HADOOP-7737. normalize hadoop-mapreduce & hadoop-dist dist/tar build with
- common/hdfs. (tucu)
-
- HADOOP-7743. Add Maven profile to create a full source tarball. (tucu)
-
HADOOP-7729. Send back valid HTTP response if user hits IPC port with
HTTP GET. (todd)
- HADOOP-7758. Make GlobFilter class public. (tucu)
-
HADOOP-7728. Enable task memory management to be configurable in hadoop
config setup script. (ramya)
@@ -67,9 +60,7 @@ Trunk (unreleased changes)
HADOOP-7688. Add servlet handler check in HttpServer.start().
(Uma Maheswara Rao G via szetszwo)
- HADOOP-7590. Mavenize streaming and MR examples. (tucu)
-
- HADOOP-7862. Move the support for multiple protocols to lower layer so
+ HADOOP-7862. Move the support for multiple protocols to lower layer so
that Writable, PB and Avro can all use it (Sanjay)
HADOOP-7876. Provided access to encoded key in DelegationKey for
@@ -91,7 +82,11 @@ Trunk (unreleased changes)
HADOOP-7808. Port HADOOP-7510 - Add configurable option to use original
hostname in token instead of IP to allow server IP change.
(Daryn Sharp via suresh)
-
+
+ HADOOP-7957. Classes deriving GetGroupsBase should be able to override
+ proxy creation. (jitendra)
+
+ HADOOP-4515. Configuration#getBoolean must not be case sensitive. (Sho Shimauchi via harsh)
BUGS
@@ -132,29 +127,14 @@ Trunk (unreleased changes)
HADOOP-7833. Fix findbugs warnings in protobuf generated code.
(John Lee via suresh)
- HADOOP-7853. multiple javax security configurations cause conflicts.
- (daryn via tucu)
-
- HDFS-2614. hadoop dist tarball is missing hdfs headers. (tucu)
-
- HADOOP-7874. native libs should be under lib/native/ dir. (tucu)
-
- HADOOP-7887. KerberosAuthenticatorHandler is not setting
- KerberosName name rules from configuration. (tucu)
-
HADOOP-7888. TestFailoverProxy fails intermittently on trunk. (Jason Lowe
via atm)
HADOOP-7897. ProtobufRpcEngine client side exception mechanism is not
consistent with WritableRpcEngine. (suresh)
- HADOOP-7902. skipping name rules setting (if already set) should be done
- on UGI initialization only. (tucu)
-
HADOOP-7913 Fix bug in ProtoBufRpcEngine (sanjay)
- HADOOP-7810. move hadoop archive to core from tools. (tucu)
-
HADOOP-7892. IPC logs too verbose after "RpcKind" introduction (todd)
HADOOP-7931. o.a.h.ipc.WritableRpcEngine should have a way to force
@@ -164,8 +144,6 @@ Trunk (unreleased changes)
HADOOP-7761. Improve the performance of raw comparisons. (todd)
- HADOOP_7917. compilation of protobuf files fails in windows/cygwin. (tucu)
-
Release 0.23.1 - Unreleased
INCOMPATIBLE CHANGES
@@ -213,6 +191,17 @@ Release 0.23.1 - Unreleased
HADOOP-7933. Add a getDelegationTokens api to FileSystem which checks
for known tokens in the passed Credentials object. (sseth)
+ HADOOP-7737. normalize hadoop-mapreduce & hadoop-dist dist/tar build with
+ common/hdfs. (tucu)
+
+ HADOOP-7743. Add Maven profile to create a full source tarball. (tucu)
+
+ HADOOP-7758. Make GlobFilter class public. (tucu)
+
+ HADOOP-7590. Mavenize streaming and MR examples. (tucu)
+
+ HADOOP-7934. Normalize dependencies versions across all modules. (tucu)
+
OPTIMIZATIONS
BUG FIXES
@@ -252,6 +241,27 @@ Release 0.23.1 - Unreleased
HADOOP-7949. Updated maxIdleTime default in the code to match
core-default.xml (eli)
+ HADOOP-7853. multiple javax security configurations cause conflicts.
+ (daryn via tucu)
+
+ HDFS-2614. hadoop dist tarball is missing hdfs headers. (tucu)
+
+ HADOOP-7874. native libs should be under lib/native/ dir. (tucu)
+
+ HADOOP-7887. KerberosAuthenticatorHandler is not setting
+ KerberosName name rules from configuration. (tucu)
+
+ HADOOP-7902. skipping name rules setting (if already set) should be done
+ on UGI initialization only. (tucu)
+
+ HADOOP-7810. move hadoop archive to core from tools. (tucu)
+
+ HADOOP_7917. compilation of protobuf files fails in windows/cygwin. (tucu)
+
+ HADOOP-7907. hadoop-tools JARs are not part of the distro. (tucu)
+
+ HADOOP-7936. There's a Hoop README in the root dir of the tarball. (tucu)
+
Release 0.23.0 - 2011-11-01
INCOMPATIBLE CHANGES
@@ -973,6 +983,9 @@ Release 0.22.1 - Unreleased
BUG FIXES
+ HADOOP-7937. Forward port SequenceFile#syncFs and friends from Hadoop 1.x.
+ (tomwhite)
+
Release 0.22.0 - 2011-11-29
INCOMPATIBLE CHANGES
Propchange: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 6 18:47:05 2012
@@ -1,5 +1,5 @@
/hadoop/common/branches/yahoo-merge/CHANGES.txt:1079157,1079163-1079164,1079167
-/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:1161333-1227765
+/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:1161333-1228336
/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/HDFS-1623/hadoop-common-project/hadoop-common/src/main/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 6 18:47:05 2012
@@ -1,2 +1,2 @@
-/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:1152502-1227765
+/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:1152502-1228336
/hadoop/core/branches/branch-0.19/src/docs:713112
Propchange: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 6 18:47:05 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:1152502-1227765
+/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:1152502-1228336
/hadoop/core/branches/branch-0.19/core/src/java:713112
/hadoop/core/trunk/src/core:776175-785643,785929-786278
Modified: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java?rev=1228339&r1=1228338&r2=1228339&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java Fri Jan 6 18:47:05 2012
@@ -826,6 +826,12 @@ public class Configuration implements It
*/
public boolean getBoolean(String name, boolean defaultValue) {
String valueString = getTrimmed(name);
+ if (null == valueString || "".equals(valueString)) {
+ return defaultValue;
+ }
+
+ valueString = valueString.toLowerCase();
+
if ("true".equals(valueString))
return true;
else if ("false".equals(valueString))
Modified: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java?rev=1228339&r1=1228338&r2=1228339&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java Fri Jan 6 18:47:05 2012
@@ -1193,6 +1193,13 @@ public class SequenceFile {
}
}
+ /** flush all currently written data to the file system */
+ public void syncFs() throws IOException {
+ if (out != null) {
+ out.sync(); // flush contents to file system
+ }
+ }
+
/** Returns the configuration of this file. */
Configuration getConf() { return conf; }
Modified: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tools/GetGroupsBase.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tools/GetGroupsBase.java?rev=1228339&r1=1228338&r2=1228339&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tools/GetGroupsBase.java (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tools/GetGroupsBase.java Fri Jan 6 18:47:05 2012
@@ -94,7 +94,7 @@ public abstract class GetGroupsBase exte
* @return A {@link GetUserMappingsProtocol} client proxy.
* @throws IOException
*/
- private GetUserMappingsProtocol getUgmProtocol() throws IOException {
+ protected GetUserMappingsProtocol getUgmProtocol() throws IOException {
GetUserMappingsProtocol userGroupMappingProtocol =
RPC.getProxy(GetUserMappingsProtocol.class,
GetUserMappingsProtocol.versionID,
Propchange: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 6 18:47:05 2012
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:1152502-1227765
+/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:1152502-1228336
/hadoop/core/branches/branch-0.19/core/src/test/core:713112
/hadoop/core/trunk/src/test/core:776175-785643,785929-786278
Modified: hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java?rev=1228339&r1=1228338&r2=1228339&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java Fri Jan 6 18:47:05 2012
@@ -451,6 +451,9 @@ public class TestConfiguration extends T
appendProperty("test.bool3", " true ");
appendProperty("test.bool4", " false ");
appendProperty("test.bool5", "foo");
+ appendProperty("test.bool6", "TRUE");
+ appendProperty("test.bool7", "FALSE");
+ appendProperty("test.bool8", "");
endConfig();
Path fileResource = new Path(CONFIG);
conf.addResource(fileResource);
@@ -459,6 +462,9 @@ public class TestConfiguration extends T
assertEquals(true, conf.getBoolean("test.bool3", false));
assertEquals(false, conf.getBoolean("test.bool4", true));
assertEquals(true, conf.getBoolean("test.bool5", true));
+ assertEquals(true, conf.getBoolean("test.bool6", false));
+ assertEquals(false, conf.getBoolean("test.bool7", true));
+ assertEquals(false, conf.getBoolean("test.bool8", false));
}
public void testFloatValues() throws IOException {