svn commit: r1434570 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/io/compress/CompressionCodecFactory.java src/test/java/org/a
Author: todd Date: Thu Jan 17 07:19:45 2013 New Revision: 1434570 URL: http://svn.apache.org/viewvc?rev=1434570&view=rev Log: HADOOP-9216. CompressionCodecFactory#getCodecClasses should trim the result of parsing by Configuration. Contributed by Tsuyoshi Ozawa. Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CompressionCodecFactory.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodecFactory.java Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1434570&r1=1434569&r2=1434570&view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Thu Jan 17 07:19:45 2013 @@ -126,6 +126,9 @@ Release 2.0.3-alpha - Unreleased HADOOP-9106. Allow configuration of IPC connect timeout. (Rober Parker via suresh) +HADOOP-9216. CompressionCodecFactory#getCodecClasses should trim the +result of parsing by Configuration. (Tsuyoshi Ozawa via todd) + OPTIMIZATIONS HADOOP-8866. SampleQuantiles#query is O(N^2) instead of O(N). (Andrew Wang Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CompressionCodecFactory.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CompressionCodecFactory.java?rev=1434570&r1=1434569&r2=1434570&view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CompressionCodecFactory.java (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CompressionCodecFactory.java Thu Jan 17 07:19:45 2013 @@ -122,7 +122,7 @@ public class CompressionCodecFactory { if (codecsString != null) { StringTokenizer codecSplit = new StringTokenizer(codecsString, ","); while (codecSplit.hasMoreElements()) { -String codecSubstring = codecSplit.nextToken(); +String codecSubstring = codecSplit.nextToken().trim(); if (codecSubstring.length() != 0) { try { Class cls = conf.getClassByName(codecSubstring); Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodecFactory.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodecFactory.java?rev=1434570&r1=1434569&r2=1434570&view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodecFactory.java (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodecFactory.java Thu Jan 17 07:19:45 2013 @@ -256,5 +256,17 @@ public class TestCodecFactory extends Te checkCodec("overridden factory for .gz", NewGzipCodec.class, codec); codec = factory.getCodecByClassName(NewGzipCodec.class.getCanonicalName()); checkCodec("overridden factory for gzip codec", NewGzipCodec.class, codec); + +Configuration conf = new Configuration(); +conf.set("io.compression.codecs", +" org.apache.hadoop.io.compress.GzipCodec , " + +"org.apache.hadoop.io.compress.DefaultCodec , " + +" org.apache.hadoop.io.compress.BZip2Codec "); +try { + CompressionCodecFactory.getCodecClasses(conf); +} catch (IllegalArgumentException e) { + fail("IllegalArgumentException is unexpected"); +} + } }
svn commit: r1434569 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/io/compress/CompressionCodecFactory.java src/test/java/org/apache/hadoop
Author: todd Date: Thu Jan 17 07:19:41 2013 New Revision: 1434569 URL: http://svn.apache.org/viewvc?rev=1434569&view=rev Log: HADOOP-9216. CompressionCodecFactory#getCodecClasses should trim the result of parsing by Configuration. Contributed by Tsuyoshi Ozawa. Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CompressionCodecFactory.java hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodecFactory.java Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1434569&r1=1434568&r2=1434569&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Thu Jan 17 07:19:41 2013 @@ -444,6 +444,9 @@ Release 2.0.3-alpha - Unreleased HADOOP-9106. Allow configuration of IPC connect timeout. (Rober Parker via suresh) +HADOOP-9216. CompressionCodecFactory#getCodecClasses should trim the +result of parsing by Configuration. (Tsuyoshi Ozawa via todd) + OPTIMIZATIONS HADOOP-8866. SampleQuantiles#query is O(N^2) instead of O(N). (Andrew Wang Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CompressionCodecFactory.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CompressionCodecFactory.java?rev=1434569&r1=1434568&r2=1434569&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CompressionCodecFactory.java (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CompressionCodecFactory.java Thu Jan 17 07:19:41 2013 @@ -122,7 +122,7 @@ public class CompressionCodecFactory { if (codecsString != null) { StringTokenizer codecSplit = new StringTokenizer(codecsString, ","); while (codecSplit.hasMoreElements()) { -String codecSubstring = codecSplit.nextToken(); +String codecSubstring = codecSplit.nextToken().trim(); if (codecSubstring.length() != 0) { try { Class cls = conf.getClassByName(codecSubstring); Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodecFactory.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodecFactory.java?rev=1434569&r1=1434568&r2=1434569&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodecFactory.java (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodecFactory.java Thu Jan 17 07:19:41 2013 @@ -256,5 +256,17 @@ public class TestCodecFactory extends Te checkCodec("overridden factory for .gz", NewGzipCodec.class, codec); codec = factory.getCodecByClassName(NewGzipCodec.class.getCanonicalName()); checkCodec("overridden factory for gzip codec", NewGzipCodec.class, codec); + +Configuration conf = new Configuration(); +conf.set("io.compression.codecs", +" org.apache.hadoop.io.compress.GzipCodec , " + +"org.apache.hadoop.io.compress.DefaultCodec , " + +" org.apache.hadoop.io.compress.BZip2Codec "); +try { + CompressionCodecFactory.getCodecClasses(conf); +} catch (IllegalArgumentException e) { + fail("IllegalArgumentException is unexpected"); +} + } }
svn commit: r1434531 - /hadoop/common/branches/branch-2/hadoop-tools/hadoop-pipes/pom.xml
Author: todd Date: Thu Jan 17 01:37:45 2013 New Revision: 1434531 URL: http://svn.apache.org/viewvc?rev=1434531&view=rev Log: HADOOP-9215. when using cmake-2.6, libhadoop.so doesn't get created (only libhadoop.so.1.0.0). Contributed by Colin Patrick McCabe. Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-pipes/pom.xml Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-pipes/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-pipes/pom.xml?rev=1434531&r1=1434530&r2=1434531&view=diff == --- hadoop/common/branches/branch-2/hadoop-tools/hadoop-pipes/pom.xml (original) +++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-pipes/pom.xml Thu Jan 17 01:37:45 2013 @@ -57,6 +57,9 @@ + +
svn commit: r1434531 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt pom.xml
Author: todd Date: Thu Jan 17 01:37:45 2013 New Revision: 1434531 URL: http://svn.apache.org/viewvc?rev=1434531&view=rev Log: HADOOP-9215. when using cmake-2.6, libhadoop.so doesn't get created (only libhadoop.so.1.0.0). Contributed by Colin Patrick McCabe. Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1434531&r1=1434530&r2=1434531&view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Thu Jan 17 01:37:45 2013 @@ -253,6 +253,9 @@ Release 2.0.3-alpha - Unreleased HADOOP-9193. hadoop script can inadvertently expand wildcard arguments when delegating to hdfs script. (Andy Isaacson via todd) +HADOOP-9215. when using cmake-2.6, libhadoop.so doesn't get created +(only libhadoop.so.1.0.0) (Colin Patrick McCabe via todd) + Release 2.0.2-alpha - 2012-09-07 INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml?rev=1434531&r1=1434530&r2=1434531&view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml Thu Jan 17 01:37:45 2013 @@ -521,6 +521,9 @@ + +
svn commit: r1434530 - /hadoop/common/trunk/hadoop-tools/hadoop-pipes/pom.xml
Author: todd Date: Thu Jan 17 01:37:41 2013 New Revision: 1434530 URL: http://svn.apache.org/viewvc?rev=1434530&view=rev Log: HADOOP-9215. when using cmake-2.6, libhadoop.so doesn't get created (only libhadoop.so.1.0.0). Contributed by Colin Patrick McCabe. Modified: hadoop/common/trunk/hadoop-tools/hadoop-pipes/pom.xml Modified: hadoop/common/trunk/hadoop-tools/hadoop-pipes/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-pipes/pom.xml?rev=1434530&r1=1434529&r2=1434530&view=diff == --- hadoop/common/trunk/hadoop-tools/hadoop-pipes/pom.xml (original) +++ hadoop/common/trunk/hadoop-tools/hadoop-pipes/pom.xml Thu Jan 17 01:37:41 2013 @@ -57,6 +57,9 @@ + +
svn commit: r1434530 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt pom.xml
Author: todd Date: Thu Jan 17 01:37:41 2013 New Revision: 1434530 URL: http://svn.apache.org/viewvc?rev=1434530&view=rev Log: HADOOP-9215. when using cmake-2.6, libhadoop.so doesn't get created (only libhadoop.so.1.0.0). Contributed by Colin Patrick McCabe. Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1434530&r1=1434529&r2=1434530&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Thu Jan 17 01:37:41 2013 @@ -560,6 +560,9 @@ Release 2.0.3-alpha - Unreleased HADOOP-9193. hadoop script can inadvertently expand wildcard arguments when delegating to hdfs script. (Andy Isaacson via todd) +HADOOP-9215. when using cmake-2.6, libhadoop.so doesn't get created +(only libhadoop.so.1.0.0) (Colin Patrick McCabe via todd) + Release 2.0.2-alpha - 2012-09-07 INCOMPATIBLE CHANGES Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml?rev=1434530&r1=1434529&r2=1434530&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml Thu Jan 17 01:37:41 2013 @@ -526,6 +526,9 @@ + +
svn commit: r1434506 - in /hadoop/common/branches/branch-1: CHANGES.txt src/webapps/history/jobhistoryhome.jsp
Author: tucu Date: Wed Jan 16 23:56:04 2013 New Revision: 1434506 URL: http://svn.apache.org/viewvc?rev=1434506&view=rev Log: MAPREDUCE-4315. jobhistory.jsp throws 500 when a .txt file is found in /done. (sandyr via tucu) Modified: hadoop/common/branches/branch-1/CHANGES.txt hadoop/common/branches/branch-1/src/webapps/history/jobhistoryhome.jsp Modified: hadoop/common/branches/branch-1/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1434506&r1=1434505&r2=1434506&view=diff == --- hadoop/common/branches/branch-1/CHANGES.txt (original) +++ hadoop/common/branches/branch-1/CHANGES.txt Wed Jan 16 23:56:04 2013 @@ -434,6 +434,9 @@ Release 1.2.0 - unreleased MAPREDUCE-4924. flakey test: org.apache.hadoop.mapred.TestClusterMRNotification.testMR. (rkanter via tucu) +MAPREDUCE-4315. jobhistory.jsp throws 500 when a .txt file is found in /done. +(sandyr via tucu) + Release 1.1.2 - Unreleased INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-1/src/webapps/history/jobhistoryhome.jsp URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/webapps/history/jobhistoryhome.jsp?rev=1434506&r1=1434505&r2=1434506&view=diff == --- hadoop/common/branches/branch-1/src/webapps/history/jobhistoryhome.jsp (original) +++ hadoop/common/branches/branch-1/src/webapps/history/jobhistoryhome.jsp Wed Jan 16 23:56:04 2013 @@ -152,11 +152,24 @@ window.location.href = url; || fileName.split("_")[FILENAME_JOBNAME_PART].toLowerCase() .contains(jobnameKeywordInFname); } + + private boolean isHistoryFile(String fileName) { +String[] tokens = null; +try { + String dp = JobHistory.JobInfo.decodeJobHistoryFileName(fileName); + tokens = dp.split("_"); +} catch (IOException ioe) { +} + +return tokens != null && !fileName.endsWith(".xml") && tokens.length > 3 +&& tokens[1].matches("\\d+") && tokens[2].matches("\\d+") +&& tokens[3].matches("\\d+"); + } public boolean accept(Path path) { String name = path.getName(); -return !(name.endsWith(".xml")) && matchUser(name) && matchJobName(name); +return isHistoryFile(name) && matchUser(name) && matchJobName(name); } };
svn commit: r1434452 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/bin/hadoop
Author: todd Date: Wed Jan 16 22:29:58 2013 New Revision: 1434452 URL: http://svn.apache.org/viewvc?rev=1434452&view=rev Log: HADOOP-9193. hadoop script can inadvertently expand wildcard arguments when delegating to hdfs script. Contributed by Andy Isaacson. Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/hadoop Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1434452&r1=1434451&r2=1434452&view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Wed Jan 16 22:29:58 2013 @@ -250,6 +250,9 @@ Release 2.0.3-alpha - Unreleased HADOOP-8589 ViewFs tests fail when tests and home dirs are nested. (sanjay Radia) +HADOOP-9193. hadoop script can inadvertently expand wildcard arguments +when delegating to hdfs script. (Andy Isaacson via todd) + Release 2.0.2-alpha - 2012-09-07 INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/hadoop URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/hadoop?rev=1434452&r1=1434451&r2=1434452&view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/hadoop (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/bin/hadoop Wed Jan 16 22:29:58 2013 @@ -58,9 +58,9 @@ case $COMMAND in #try to locate hdfs and if present, delegate to it. shift if [ -f "${HADOOP_HDFS_HOME}"/bin/hdfs ]; then - exec "${HADOOP_HDFS_HOME}"/bin/hdfs ${COMMAND/dfsgroups/groups} $* + exec "${HADOOP_HDFS_HOME}"/bin/hdfs ${COMMAND/dfsgroups/groups} "$@" elif [ -f "${HADOOP_PREFIX}"/bin/hdfs ]; then - exec "${HADOOP_PREFIX}"/bin/hdfs ${COMMAND/dfsgroups/groups} $* + exec "${HADOOP_PREFIX}"/bin/hdfs ${COMMAND/dfsgroups/groups} "$@" else echo "HADOOP_HDFS_HOME not found!" exit 1 @@ -75,9 +75,9 @@ case $COMMAND in #try to locate mapred and if present, delegate to it. shift if [ -f "${HADOOP_MAPRED_HOME}"/bin/mapred ]; then - exec "${HADOOP_MAPRED_HOME}"/bin/mapred ${COMMAND/mrgroups/groups} $* + exec "${HADOOP_MAPRED_HOME}"/bin/mapred ${COMMAND/mrgroups/groups} "$@" elif [ -f "${HADOOP_PREFIX}"/bin/mapred ]; then - exec "${HADOOP_PREFIX}"/bin/mapred ${COMMAND/mrgroups/groups} $* + exec "${HADOOP_PREFIX}"/bin/mapred ${COMMAND/mrgroups/groups} "$@" else echo "HADOOP_MAPRED_HOME not found!" exit 1
svn commit: r1434450 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/bin/hadoop
Author: todd Date: Wed Jan 16 22:29:53 2013 New Revision: 1434450 URL: http://svn.apache.org/viewvc?rev=1434450&view=rev Log: HADOOP-9193. hadoop script can inadvertently expand wildcard arguments when delegating to hdfs script. Contributed by Andy Isaacson. Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1434450&r1=1434449&r2=1434450&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Wed Jan 16 22:29:53 2013 @@ -557,6 +557,9 @@ Release 2.0.3-alpha - Unreleased HADOOP-9212. Potential deadlock in FileSystem.Cache/IPC/UGI. (tomwhite) +HADOOP-9193. hadoop script can inadvertently expand wildcard arguments +when delegating to hdfs script. (Andy Isaacson via todd) + Release 2.0.2-alpha - 2012-09-07 INCOMPATIBLE CHANGES Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop?rev=1434450&r1=1434449&r2=1434450&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop Wed Jan 16 22:29:53 2013 @@ -58,9 +58,9 @@ case $COMMAND in #try to locate hdfs and if present, delegate to it. shift if [ -f "${HADOOP_HDFS_HOME}"/bin/hdfs ]; then - exec "${HADOOP_HDFS_HOME}"/bin/hdfs ${COMMAND/dfsgroups/groups} $* + exec "${HADOOP_HDFS_HOME}"/bin/hdfs ${COMMAND/dfsgroups/groups} "$@" elif [ -f "${HADOOP_PREFIX}"/bin/hdfs ]; then - exec "${HADOOP_PREFIX}"/bin/hdfs ${COMMAND/dfsgroups/groups} $* + exec "${HADOOP_PREFIX}"/bin/hdfs ${COMMAND/dfsgroups/groups} "$@" else echo "HADOOP_HDFS_HOME not found!" exit 1 @@ -75,9 +75,9 @@ case $COMMAND in #try to locate mapred and if present, delegate to it. shift if [ -f "${HADOOP_MAPRED_HOME}"/bin/mapred ]; then - exec "${HADOOP_MAPRED_HOME}"/bin/mapred ${COMMAND/mrgroups/groups} $* + exec "${HADOOP_MAPRED_HOME}"/bin/mapred ${COMMAND/mrgroups/groups} "$@" elif [ -f "${HADOOP_PREFIX}"/bin/mapred ]; then - exec "${HADOOP_PREFIX}"/bin/mapred ${COMMAND/mrgroups/groups} $* + exec "${HADOOP_PREFIX}"/bin/mapred ${COMMAND/mrgroups/groups} "$@" else echo "HADOOP_MAPRED_HOME not found!" exit 1
svn commit: r1434412 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/conf/Configuration.java
Author: jlowe Date: Wed Jan 16 21:26:04 2013 New Revision: 1434412 URL: http://svn.apache.org/viewvc?rev=1434412&view=rev Log: svn merge -c 1303634 FIXES: HADOOP-8157. Fix race condition in Configuration that could cause spurious ClassNotFoundExceptions after a GC. Contributed by Todd Lipcon. 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 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=1434412&r1=1434411&r2=1434412&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 Wed Jan 16 21:26:04 2013 @@ -12,6 +12,9 @@ Release 0.23.7 - UNRELEASED BUG FIXES + HADOOP-8157. Fix race condition in Configuration that could cause spurious + ClassNotFoundExceptions after a GC. (todd) + Release 0.23.6 - UNRELEASED INCOMPATIBLE CHANGES 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=1434412&r1=1434411&r2=1434412&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 Wed Jan 16 21:26:04 2013 @@ -223,6 +223,12 @@ public class Configuration implements It CACHE_CLASSES = new WeakHashMap>>(); /** + * Sentinel value to store negative cache results in {@link #CACHE_CLASSES}. + */ + private static final Class NEGATIVE_CACHE_SENTINEL = +NegativeCacheSentinel.class; + + /** * Stores the mapping of key to the resource which modifies or loads * the key most recently */ @@ -1474,24 +1480,24 @@ public class Configuration implements It } } -Class clazz = null; -if (!map.containsKey(name)) { +Class clazz = map.get(name); +if (clazz == null) { try { clazz = Class.forName(name, true, classLoader); } catch (ClassNotFoundException e) { -map.put(name, null); //cache negative that class is not found +// Leave a marker that the class isn't found +map.put(name, NEGATIVE_CACHE_SENTINEL); return null; } // two putters can race here, but they'll put the same class map.put(name, clazz); -} else { // check already performed on this class name - clazz = map.get(name); - if (clazz == null) { // found the negative -return null; - } + return clazz; +} else if (clazz == NEGATIVE_CACHE_SENTINEL) { + return null; // not found +} else { + // cache hit + return clazz; } - -return clazz; } /** @@ -2248,4 +2254,10 @@ public class Configuration implements It Configuration.addDeprecation("dfs.umaskmode", new String[]{CommonConfigurationKeys.FS_PERMISSIONS_UMASK_KEY}); } + + /** + * A unique class which is used as a sentinel value in the caching + * for getClassByName. {@see Configuration#getClassByNameOrNull(String)} + */ + private static abstract class NegativeCacheSentinel {} }
svn commit: r1434392 - /hadoop/common/tags/release-0.23.6-rc0/
Author: tgraves Date: Wed Jan 16 21:02:24 2013 New Revision: 1434392 URL: http://svn.apache.org/viewvc?rev=1434392&view=rev Log: Hadoop 0.23.6-rc0 release. Added: hadoop/common/tags/release-0.23.6-rc0/ (props changed) - copied from r1434391, hadoop/common/branches/branch-0.23.6/ Propchange: hadoop/common/tags/release-0.23.6-rc0/ -- --- svn:ignore (added) +++ svn:ignore Wed Jan 16 21:02:24 2013 @@ -0,0 +1,5 @@ +.classpath +.git +.project +.settings +target Propchange: hadoop/common/tags/release-0.23.6-rc0/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Jan 16 21:02:24 2013 @@ -0,0 +1 @@ +/hadoop/common/trunk:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182189,1182205,1182214,1189613,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213954,1214046,1220510,1221348,1225114,1225192,1225456,1225489,1225591,1226211,1226239,1226350,1227091,1227165,1227423,1227964,1229347,1230398,1231569,1231572,1231627,1231640,1233605,1234555,1235135,1235137,1235956,1236456,1239752,1240897,1240928,1243065,1243104,1244766,1245751,1245762,1293419,1304099,1351818,1373683,1382409
svn commit: r1434373 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Author: daryn Date: Wed Jan 16 20:37:53 2013 New Revision: 1434373 URL: http://svn.apache.org/viewvc?rev=1434373&view=rev Log: HADOOP-8999. Move to incompatible section of changelog Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1434373&r1=1434372&r2=1434373&view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Wed Jan 16 20:37:53 2013 @@ -4,6 +4,8 @@ Release 2.0.3-alpha - Unreleased INCOMPATIBLE CHANGES +HADOOP-8999. SASL negotiation is flawed (daryn) + NEW FEATURES HADOOP-8561. Introduce HADOOP_PROXY_USER for secure impersonation in child @@ -195,8 +197,6 @@ Release 2.0.3-alpha - Unreleased HADOOP-7115. Add a cache for getpwuid_r and getpwgid_r calls (tucu) -HADOOP-8999. SASL negotiation is flawed (daryn) - HADOOP-6607. Add different variants of non caching HTTP headers. (tucu) HADOOP-9049. DelegationTokenRenewer needs to be Singleton and FileSystems
svn commit: r1434370 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
Author: daryn Date: Wed Jan 16 20:34:03 2013 New Revision: 1434370 URL: http://svn.apache.org/viewvc?rev=1434370&view=rev Log: HADOOP-8999. Move to incompatible section of changelog Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1434370&r1=1434369&r2=1434370&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Wed Jan 16 20:34:03 2013 @@ -326,6 +326,8 @@ Release 2.0.3-alpha - Unreleased INCOMPATIBLE CHANGES +HADOOP-8999. SASL negotiation is flawed (daryn) + NEW FEATURES HADOOP-8597. Permit FsShell's text command to read Avro files. @@ -502,8 +504,6 @@ Release 2.0.3-alpha - Unreleased HADOOP-7115. Add a cache for getpwuid_r and getpwgid_r calls (tucu) -HADOOP-8999. SASL negotiation is flawed (daryn) - HADOOP-6607. Add different variants of non caching HTTP headers. (tucu) HADOOP-9049. DelegationTokenRenewer needs to be Singleton and FileSystems
[Hadoop Wiki] Update of "HowToReleasePostMavenization" by ThomasGraves
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Hadoop Wiki" for change notification. The "HowToReleasePostMavenization" page has been changed by ThomasGraves: http://wiki.apache.org/hadoop/HowToReleasePostMavenization?action=diff&rev1=44&rev2=45 Comment: update files change -SNAPSHOT in 1. Use a 32-bit JVM. Currently we don't have support for 64-bit binaries in our maven builds. 1. Change refs to -SNAPSHOT in the following files:{{{ hadoop-hdfs-project/hadoop-hdfs/src/test/aop/build/aop.xml - hadoop-mapreduce-project/build.xml hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml - hadoop-mapreduce-project/ivy/hadoop-mapred-instrumented-template.xml - hadoop-mapreduce-project/ivy/hadoop-mapred-template.xml - hadoop-mapreduce-project/ivy/libraries.properties - hadoop-mapreduce-project/src/test/aop/build/aop.xml }}} = Building the Release Candidate (RC) =
svn commit: r1434086 [1/3] - in /hadoop/common/branches/branch-0.23.6/hadoop-common-project: hadoop-annotations/pom.xml hadoop-auth-examples/pom.xml hadoop-auth/pom.xml hadoop-common/pom.xml hadoop-co
Author: tgraves Date: Wed Jan 16 18:20:08 2013 New Revision: 1434086 URL: http://svn.apache.org/viewvc?rev=1434086&view=rev Log: Preparing for release 0.23.6 Modified: hadoop/common/branches/branch-0.23.6/hadoop-common-project/hadoop-annotations/pom.xml hadoop/common/branches/branch-0.23.6/hadoop-common-project/hadoop-auth-examples/pom.xml hadoop/common/branches/branch-0.23.6/hadoop-common-project/hadoop-auth/pom.xml hadoop/common/branches/branch-0.23.6/hadoop-common-project/hadoop-common/pom.xml hadoop/common/branches/branch-0.23.6/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html hadoop/common/branches/branch-0.23.6/hadoop-common-project/pom.xml Modified: hadoop/common/branches/branch-0.23.6/hadoop-common-project/hadoop-annotations/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.6/hadoop-common-project/hadoop-annotations/pom.xml?rev=1434086&r1=1434085&r2=1434086&view=diff == --- hadoop/common/branches/branch-0.23.6/hadoop-common-project/hadoop-annotations/pom.xml (original) +++ hadoop/common/branches/branch-0.23.6/hadoop-common-project/hadoop-annotations/pom.xml Wed Jan 16 18:20:08 2013 @@ -21,12 +21,12 @@ org.apache.hadoop hadoop-project -0.23.6-SNAPSHOT +0.23.6 ../../hadoop-project org.apache.hadoop hadoop-annotations - 0.23.6-SNAPSHOT + 0.23.6 Apache Hadoop Annotations Apache Hadoop Annotations jar Modified: hadoop/common/branches/branch-0.23.6/hadoop-common-project/hadoop-auth-examples/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.6/hadoop-common-project/hadoop-auth-examples/pom.xml?rev=1434086&r1=1434085&r2=1434086&view=diff == --- hadoop/common/branches/branch-0.23.6/hadoop-common-project/hadoop-auth-examples/pom.xml (original) +++ hadoop/common/branches/branch-0.23.6/hadoop-common-project/hadoop-auth-examples/pom.xml Wed Jan 16 18:20:08 2013 @@ -20,12 +20,12 @@ org.apache.hadoop hadoop-project -0.23.6-SNAPSHOT +0.23.6 ../../hadoop-project org.apache.hadoop hadoop-auth-examples - 0.23.6-SNAPSHOT + 0.23.6 war Apache Hadoop Auth Examples Modified: hadoop/common/branches/branch-0.23.6/hadoop-common-project/hadoop-auth/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.6/hadoop-common-project/hadoop-auth/pom.xml?rev=1434086&r1=1434085&r2=1434086&view=diff == --- hadoop/common/branches/branch-0.23.6/hadoop-common-project/hadoop-auth/pom.xml (original) +++ hadoop/common/branches/branch-0.23.6/hadoop-common-project/hadoop-auth/pom.xml Wed Jan 16 18:20:08 2013 @@ -20,12 +20,12 @@ org.apache.hadoop hadoop-project -0.23.6-SNAPSHOT +0.23.6 ../../hadoop-project org.apache.hadoop hadoop-auth - 0.23.6-SNAPSHOT + 0.23.6 jar Apache Hadoop Auth Modified: hadoop/common/branches/branch-0.23.6/hadoop-common-project/hadoop-common/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.6/hadoop-common-project/hadoop-common/pom.xml?rev=1434086&r1=1434085&r2=1434086&view=diff == --- hadoop/common/branches/branch-0.23.6/hadoop-common-project/hadoop-common/pom.xml (original) +++ hadoop/common/branches/branch-0.23.6/hadoop-common-project/hadoop-common/pom.xml Wed Jan 16 18:20:08 2013 @@ -20,12 +20,12 @@ org.apache.hadoop hadoop-project-dist -0.23.6-SNAPSHOT +0.23.6 ../../hadoop-project-dist org.apache.hadoop hadoop-common - 0.23.6-SNAPSHOT + 0.23.6 Apache Hadoop Common Apache Hadoop Common jar
svn commit: r1434086 [3/3] - in /hadoop/common/branches/branch-0.23.6/hadoop-common-project: hadoop-annotations/pom.xml hadoop-auth-examples/pom.xml hadoop-auth/pom.xml hadoop-common/pom.xml hadoop-co
Modified: hadoop/common/branches/branch-0.23.6/hadoop-common-project/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.6/hadoop-common-project/pom.xml?rev=1434086&r1=1434085&r2=1434086&view=diff == --- hadoop/common/branches/branch-0.23.6/hadoop-common-project/pom.xml (original) +++ hadoop/common/branches/branch-0.23.6/hadoop-common-project/pom.xml Wed Jan 16 18:20:08 2013 @@ -20,12 +20,12 @@ org.apache.hadoop hadoop-project -0.23.6-SNAPSHOT +0.23.6 ../hadoop-project org.apache.hadoop hadoop-common-project - 0.23.6-SNAPSHOT + 0.23.6 Apache Hadoop Common Project Apache Hadoop Common Project pom
svn commit: r1434086 - in /hadoop/common/branches/branch-0.23.6: ./ hadoop-assemblies/ hadoop-client/ hadoop-dist/ hadoop-minicluster/ hadoop-project-dist/ hadoop-project/ hadoop-tools/ hadoop-tools/h
Author: tgraves Date: Wed Jan 16 18:20:08 2013 New Revision: 1434086 URL: http://svn.apache.org/viewvc?rev=1434086&view=rev Log: Preparing for release 0.23.6 Modified: hadoop/common/branches/branch-0.23.6/hadoop-assemblies/pom.xml hadoop/common/branches/branch-0.23.6/hadoop-client/pom.xml hadoop/common/branches/branch-0.23.6/hadoop-dist/pom.xml hadoop/common/branches/branch-0.23.6/hadoop-minicluster/pom.xml hadoop/common/branches/branch-0.23.6/hadoop-project-dist/pom.xml hadoop/common/branches/branch-0.23.6/hadoop-project/pom.xml hadoop/common/branches/branch-0.23.6/hadoop-tools/hadoop-archives/pom.xml hadoop/common/branches/branch-0.23.6/hadoop-tools/hadoop-datajoin/pom.xml hadoop/common/branches/branch-0.23.6/hadoop-tools/hadoop-distcp/pom.xml hadoop/common/branches/branch-0.23.6/hadoop-tools/hadoop-extras/pom.xml hadoop/common/branches/branch-0.23.6/hadoop-tools/hadoop-gridmix/pom.xml hadoop/common/branches/branch-0.23.6/hadoop-tools/hadoop-pipes/pom.xml hadoop/common/branches/branch-0.23.6/hadoop-tools/hadoop-rumen/pom.xml hadoop/common/branches/branch-0.23.6/hadoop-tools/hadoop-streaming/pom.xml hadoop/common/branches/branch-0.23.6/hadoop-tools/hadoop-tools-dist/pom.xml hadoop/common/branches/branch-0.23.6/hadoop-tools/pom.xml hadoop/common/branches/branch-0.23.6/pom.xml Modified: hadoop/common/branches/branch-0.23.6/hadoop-assemblies/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.6/hadoop-assemblies/pom.xml?rev=1434086&r1=1434085&r2=1434086&view=diff == --- hadoop/common/branches/branch-0.23.6/hadoop-assemblies/pom.xml (original) +++ hadoop/common/branches/branch-0.23.6/hadoop-assemblies/pom.xml Wed Jan 16 18:20:08 2013 @@ -23,12 +23,12 @@ org.apache.hadoop hadoop-project -0.23.6-SNAPSHOT +0.23.6 ../hadoop-project org.apache.hadoop hadoop-assemblies - 0.23.6-SNAPSHOT + 0.23.6 Apache Hadoop Assemblies Apache Hadoop Assemblies Modified: hadoop/common/branches/branch-0.23.6/hadoop-client/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.6/hadoop-client/pom.xml?rev=1434086&r1=1434085&r2=1434086&view=diff == --- hadoop/common/branches/branch-0.23.6/hadoop-client/pom.xml (original) +++ hadoop/common/branches/branch-0.23.6/hadoop-client/pom.xml Wed Jan 16 18:20:08 2013 @@ -18,12 +18,12 @@ org.apache.hadoop hadoop-project -0.23.6-SNAPSHOT +0.23.6 ../hadoop-project org.apache.hadoop hadoop-client - 0.23.6-SNAPSHOT + 0.23.6 jar Apache Hadoop Client Modified: hadoop/common/branches/branch-0.23.6/hadoop-dist/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.6/hadoop-dist/pom.xml?rev=1434086&r1=1434085&r2=1434086&view=diff == --- hadoop/common/branches/branch-0.23.6/hadoop-dist/pom.xml (original) +++ hadoop/common/branches/branch-0.23.6/hadoop-dist/pom.xml Wed Jan 16 18:20:08 2013 @@ -20,12 +20,12 @@ org.apache.hadoop hadoop-project -0.23.6-SNAPSHOT +0.23.6 ../hadoop-project org.apache.hadoop hadoop-dist - 0.23.6-SNAPSHOT + 0.23.6 Apache Hadoop Distribution Apache Hadoop Distribution jar Modified: hadoop/common/branches/branch-0.23.6/hadoop-minicluster/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.6/hadoop-minicluster/pom.xml?rev=1434086&r1=1434085&r2=1434086&view=diff == --- hadoop/common/branches/branch-0.23.6/hadoop-minicluster/pom.xml (original) +++ hadoop/common/branches/branch-0.23.6/hadoop-minicluster/pom.xml Wed Jan 16 18:20:08 2013 @@ -18,12 +18,12 @@ org.apache.hadoop hadoop-project -0.23.6-SNAPSHOT +0.23.6 ../hadoop-project org.apache.hadoop hadoop-minicluster - 0.23.6-SNAPSHOT + 0.23.6 jar Apache Hadoop Mini-Cluster Modified: hadoop/common/branches/branch-0.23.6/hadoop-project-dist/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.6/hadoop-project-dist/pom.xml?rev=1434086&r1=1434085&r2=1434086&view=diff == --- hadoop/common/branches/branch-0.23.6/hadoop-project-dist/pom.xml (original) +++ hadoop/common/branches/branch-0.23.6/hadoop-project-dist/pom.xml Wed Jan 16 18:20:08 2013 @@ -20,12 +20,12 @@ org.apache.hadoop hadoop-project -0.23.6-SNAPSHOT +0.23.6 ../hadoop-project org.apache.hadoop hadoop-project-dist - 0.23.6-SNAPSHOT + 0.23.6 Apache Hadoop Project Dist POM Apache Hadoop Project Dist POM pom Modified: hadoop/common/branches/branch-0.23.6/hadoop-project/pom.xml URL:
[Hadoop Wiki] Trivial Update of "HowToReleasePostMavenization" by ThomasGraves
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Hadoop Wiki" for change notification. The "HowToReleasePostMavenization" page has been changed by ThomasGraves: http://wiki.apache.org/hadoop/HowToReleasePostMavenization?action=diff&rev1=43&rev2=44 1. Update {{{releasenotes.html}}} {{{ mv releasenotes.$(vers).html ./hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html }}} Note that the script generates a set of notes for HDFS, HADOOP, MAPREDUCE, and YARN too, but only common is linked from the html documentation so the indavidual ones are ignored for now. - 1. Update the version number in the pom files on trunk to X.Y.N {{{mvn versions:set -DnewVersion=X.ZN}}} where ''N'' is one greater than the release being made. + 1. Update the version number in the pom files on trunk to X.Y.N {{{mvn versions:set -DnewVersion=X.Z.N}}} where ''N'' is one greater than the release being made. 1. Update the {{{project.version}}} number in {{{hadoop-hdfs-project/hadoop-hdfs/src/test/aop/build/aop.xml}}} on trunk to X.Y.N. 1. Update the {{{symlink link}}} number in {{{hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml}}} on trunk to X.Y.N. 1. Commit these changes. {{{
[Hadoop Wiki] Update of "HowToReleasePostMavenization" by ThomasGraves
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Hadoop Wiki" for change notification. The "HowToReleasePostMavenization" page has been changed by ThomasGraves: http://wiki.apache.org/hadoop/HowToReleasePostMavenization?action=diff&rev1=42&rev2=43 Comment: update setting version info 1. Update {{{releasenotes.html}}} {{{ mv releasenotes.$(vers).html ./hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html }}} Note that the script generates a set of notes for HDFS, HADOOP, MAPREDUCE, and YARN too, but only common is linked from the html documentation so the indavidual ones are ignored for now. - 1. Update the version number in {{{build.xml}}} to be ''hadoop-X.Y.N-dev'', where ''N'' is one greater than the release being made. + 1. Update the version number in the pom files on trunk to X.Y.N {{{mvn versions:set -DnewVersion=X.ZN}}} where ''N'' is one greater than the release being made. + 1. Update the {{{project.version}}} number in {{{hadoop-hdfs-project/hadoop-hdfs/src/test/aop/build/aop.xml}}} on trunk to X.Y.N. + 1. Update the {{{symlink link}}} number in {{{hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml}}} on trunk to X.Y.N. 1. Commit these changes. {{{ svn commit -m "Preparing for release X.Y.Z" }}}
svn commit: r1434031 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Author: tgraves Date: Wed Jan 16 16:46:12 2013 New Revision: 1434031 URL: http://svn.apache.org/viewvc?rev=1434031&view=rev Log: Preparing for release 0.23.6 Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1434031&r1=1434030&r2=1434031&view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Wed Jan 16 16:46:12 2013 @@ -940,6 +940,18 @@ Release 2.0.0-alpha - 05-23-2012 HADOOP-8655. Fix TextInputFormat for large deliminators. (Gelesh via bobby) +Release 0.23.7 - UNRELEASED + + INCOMPATIBLE CHANGES + + NEW FEATURES + + IMPROVEMENTS + + OPTIMIZATIONS + + BUG FIXES + Release 0.23.6 - UNRELEASED INCOMPATIBLE CHANGES @@ -967,7 +979,7 @@ Release 0.23.6 - UNRELEASED HADOOP-9097. Maven RAT plugin is not checking all source files (tgraves) -Release 0.23.5 - UNRELEASED +Release 0.23.5 - 2012-11-28 INCOMPATIBLE CHANGES
svn commit: r1434030 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
Author: tgraves Date: Wed Jan 16 16:43:12 2013 New Revision: 1434030 URL: http://svn.apache.org/viewvc?rev=1434030&view=rev Log: Preparing for release 0.23.6 Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1434030&r1=1434029&r2=1434030&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Wed Jan 16 16:43:12 2013 @@ -1247,6 +1247,18 @@ Release 2.0.0-alpha - 05-23-2012 HADOOP-8655. Fix TextInputFormat for large deliminators. (Gelesh via bobby) +Release 0.23.7 - UNRELEASED + + INCOMPATIBLE CHANGES + + NEW FEATURES + + IMPROVEMENTS + + OPTIMIZATIONS + + BUG FIXES + Release 0.23.6 - UNRELEASED INCOMPATIBLE CHANGES @@ -1274,7 +1286,8 @@ Release 0.23.6 - UNRELEASED HADOOP-9097. Maven RAT plugin is not checking all source files (tgraves) -Release 0.23.5 - UNRELEASED +Release 0.23.5 - 2012-11-28 + INCOMPATIBLE CHANGES
svn commit: r1434009 - in /hadoop/common/branches/branch-0.23: ./ hadoop-assemblies/ hadoop-client/ hadoop-dist/ hadoop-minicluster/ hadoop-project-dist/ hadoop-project/ hadoop-tools/ hadoop-tools/had
Author: tgraves Date: Wed Jan 16 16:10:38 2013 New Revision: 1434009 URL: http://svn.apache.org/viewvc?rev=1434009&view=rev Log: Preparing for 0.23.7 development Modified: hadoop/common/branches/branch-0.23/hadoop-assemblies/pom.xml hadoop/common/branches/branch-0.23/hadoop-client/pom.xml hadoop/common/branches/branch-0.23/hadoop-dist/pom.xml hadoop/common/branches/branch-0.23/hadoop-minicluster/pom.xml hadoop/common/branches/branch-0.23/hadoop-project-dist/pom.xml hadoop/common/branches/branch-0.23/hadoop-project/pom.xml hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-archives/pom.xml hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-datajoin/pom.xml hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/pom.xml hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-extras/pom.xml hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/pom.xml hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-pipes/pom.xml hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-rumen/pom.xml hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-streaming/pom.xml hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-tools-dist/pom.xml hadoop/common/branches/branch-0.23/hadoop-tools/pom.xml hadoop/common/branches/branch-0.23/pom.xml Modified: hadoop/common/branches/branch-0.23/hadoop-assemblies/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-assemblies/pom.xml?rev=1434009&r1=1434008&r2=1434009&view=diff == --- hadoop/common/branches/branch-0.23/hadoop-assemblies/pom.xml (original) +++ hadoop/common/branches/branch-0.23/hadoop-assemblies/pom.xml Wed Jan 16 16:10:38 2013 @@ -23,12 +23,12 @@ org.apache.hadoop hadoop-project -0.23.6-SNAPSHOT +0.23.7-SNAPSHOT ../hadoop-project org.apache.hadoop hadoop-assemblies - 0.23.6-SNAPSHOT + 0.23.7-SNAPSHOT Apache Hadoop Assemblies Apache Hadoop Assemblies Modified: hadoop/common/branches/branch-0.23/hadoop-client/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-client/pom.xml?rev=1434009&r1=1434008&r2=1434009&view=diff == --- hadoop/common/branches/branch-0.23/hadoop-client/pom.xml (original) +++ hadoop/common/branches/branch-0.23/hadoop-client/pom.xml Wed Jan 16 16:10:38 2013 @@ -18,12 +18,12 @@ org.apache.hadoop hadoop-project -0.23.6-SNAPSHOT +0.23.7-SNAPSHOT ../hadoop-project org.apache.hadoop hadoop-client - 0.23.6-SNAPSHOT + 0.23.7-SNAPSHOT jar Apache Hadoop Client Modified: hadoop/common/branches/branch-0.23/hadoop-dist/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-dist/pom.xml?rev=1434009&r1=1434008&r2=1434009&view=diff == --- hadoop/common/branches/branch-0.23/hadoop-dist/pom.xml (original) +++ hadoop/common/branches/branch-0.23/hadoop-dist/pom.xml Wed Jan 16 16:10:38 2013 @@ -20,12 +20,12 @@ org.apache.hadoop hadoop-project -0.23.6-SNAPSHOT +0.23.7-SNAPSHOT ../hadoop-project org.apache.hadoop hadoop-dist - 0.23.6-SNAPSHOT + 0.23.7-SNAPSHOT Apache Hadoop Distribution Apache Hadoop Distribution jar Modified: hadoop/common/branches/branch-0.23/hadoop-minicluster/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-minicluster/pom.xml?rev=1434009&r1=1434008&r2=1434009&view=diff == --- hadoop/common/branches/branch-0.23/hadoop-minicluster/pom.xml (original) +++ hadoop/common/branches/branch-0.23/hadoop-minicluster/pom.xml Wed Jan 16 16:10:38 2013 @@ -18,12 +18,12 @@ org.apache.hadoop hadoop-project -0.23.6-SNAPSHOT +0.23.7-SNAPSHOT ../hadoop-project org.apache.hadoop hadoop-minicluster - 0.23.6-SNAPSHOT + 0.23.7-SNAPSHOT jar Apache Hadoop Mini-Cluster Modified: hadoop/common/branches/branch-0.23/hadoop-project-dist/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-project-dist/pom.xml?rev=1434009&r1=1434008&r2=1434009&view=diff == --- hadoop/common/branches/branch-0.23/hadoop-project-dist/pom.xml (original) +++ hadoop/common/branches/branch-0.23/hadoop-project-dist/pom.xml Wed Jan 16 16:10:38 2013 @@ -20,12 +20,12 @@ org.apache.hadoop hadoop-project -0.23.6-SNAPSHOT +0.23.7-SNAPSHOT ../hadoop-project org.apache.hadoop hadoop-project-dist - 0.23.6-SNAPSHOT + 0.23.7-SNAPSHOT Apache Hadoop Project Dist POM Apache Hadoop Project Dist POM pom Modified: hadoop/common/branches/branch-0.23/hadoop-pr
svn commit: r1434009 - in /hadoop/common/branches/branch-0.23/hadoop-common-project: hadoop-annotations/pom.xml hadoop-auth-examples/pom.xml hadoop-auth/pom.xml hadoop-common/CHANGES.txt hadoop-common
Author: tgraves Date: Wed Jan 16 16:10:38 2013 New Revision: 1434009 URL: http://svn.apache.org/viewvc?rev=1434009&view=rev Log: Preparing for 0.23.7 development Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-annotations/pom.xml hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth-examples/pom.xml hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/pom.xml hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/pom.xml hadoop/common/branches/branch-0.23/hadoop-common-project/pom.xml Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-annotations/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-annotations/pom.xml?rev=1434009&r1=1434008&r2=1434009&view=diff == --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-annotations/pom.xml (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-annotations/pom.xml Wed Jan 16 16:10:38 2013 @@ -21,12 +21,12 @@ org.apache.hadoop hadoop-project -0.23.6-SNAPSHOT +0.23.7-SNAPSHOT ../../hadoop-project org.apache.hadoop hadoop-annotations - 0.23.6-SNAPSHOT + 0.23.7-SNAPSHOT Apache Hadoop Annotations Apache Hadoop Annotations jar Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth-examples/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth-examples/pom.xml?rev=1434009&r1=1434008&r2=1434009&view=diff == --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth-examples/pom.xml (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth-examples/pom.xml Wed Jan 16 16:10:38 2013 @@ -20,12 +20,12 @@ org.apache.hadoop hadoop-project -0.23.6-SNAPSHOT +0.23.7-SNAPSHOT ../../hadoop-project org.apache.hadoop hadoop-auth-examples - 0.23.6-SNAPSHOT + 0.23.7-SNAPSHOT war Apache Hadoop Auth Examples Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/pom.xml?rev=1434009&r1=1434008&r2=1434009&view=diff == --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/pom.xml (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/pom.xml Wed Jan 16 16:10:38 2013 @@ -20,12 +20,12 @@ org.apache.hadoop hadoop-project -0.23.6-SNAPSHOT +0.23.7-SNAPSHOT ../../hadoop-project org.apache.hadoop hadoop-auth - 0.23.6-SNAPSHOT + 0.23.7-SNAPSHOT jar Apache Hadoop Auth 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=1434009&r1=1434008&r2=1434009&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 Wed Jan 16 16:10:38 2013 @@ -1,5 +1,17 @@ Hadoop Change Log +Release 0.23.7 - UNRELEASED + + INCOMPATIBLE CHANGES + + NEW FEATURES + + IMPROVEMENTS + + OPTIMIZATIONS + + BUG FIXES + Release 0.23.6 - UNRELEASED INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/pom.xml?rev=1434009&r1=1434008&r2=1434009&view=diff == --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/pom.xml (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/pom.xml Wed Jan 16 16:10:38 2013 @@ -20,12 +20,12 @@ org.apache.hadoop hadoop-project-dist -0.23.6-SNAPSHOT +0.23.7-SNAPSHOT ../../hadoop-project-dist org.apache.hadoop hadoop-common - 0.23.6-SNAPSHOT + 0.23.7-SNAPSHOT Apache Hadoop Common Apache Hadoop Common jar Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/pom.xml?rev=1434009&r1=1434008&r2=1434009&view=diff == --- had
[Hadoop Wiki] Update of "HowToReleasePostMavenization" by ThomasGraves
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Hadoop Wiki" for change notification. The "HowToReleasePostMavenization" page has been changed by ThomasGraves: http://wiki.apache.org/hadoop/HowToReleasePostMavenization?action=diff&rev1=41&rev2=42 Comment: updating version setting instructions https://svn.apache.org/repos/asf/hadoop/common/branches/branch-X.Y -m "Branching for X.Y releases" }}} 1. Update {{{CHANGES.txt}}} to add back in {{{Trunk (unreleased changes)}}}. + 1. Update the default version in the pom files on trunk to X.Y+1.0-SNAPSHOT {{{mvn versions:set -DnewVersion=X.Z-SNAPSHOT}}}. - 1. Update the default version in {{{build.xml}}} on trunk to X.Y+1.0-dev. - 1. Update the version number in {{{src/docs/src/documentation/content/xdocs/tabs.xml}}} on trunk to X.Y+1.0. - 1. Update the {{{project.version}}} number in {{{/src/test/aop/build/aop.xml}}} on trunk to X.Y+1.0. + 1. Update the {{{project.version}}} number in {{{hadoop-hdfs-project/hadoop-hdfs/src/test/aop/build/aop.xml}}} on trunk to X.Y+1.0. - 1. Update the {{{hadoop-*.version}}} numbers in {{{ivy/libraries.properties}}} on trunk to X.Y+1.0. + 1. Update the {{{symlink link}}} number in {{{hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml}}} on trunk to X.Y+1.0. 1. Commit these changes to trunk. {{{ svn commit -m "Preparing for X.Y+1.0 development" }}}
svn commit: r1433999 - /hadoop/common/branches/branch-0.23.6/
Author: tgraves Date: Wed Jan 16 15:54:23 2013 New Revision: 1433999 URL: http://svn.apache.org/viewvc?rev=1433999&view=rev Log: Branching for 0.23.6 release Added: hadoop/common/branches/branch-0.23.6/ (props changed) - copied from r1433998, hadoop/common/branches/branch-0.23/ Propchange: hadoop/common/branches/branch-0.23.6/ -- --- svn:ignore (added) +++ svn:ignore Wed Jan 16 15:54:23 2013 @@ -0,0 +1,5 @@ +.classpath +.git +.project +.settings +target Propchange: hadoop/common/branches/branch-0.23.6/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Jan 16 15:54:23 2013 @@ -0,0 +1 @@ +/hadoop/common/trunk:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182189,1182205,1182214,1189613,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213954,1214046,1220510,1221348,1225114,1225192,1225456,1225489,1225591,1226211,1226239,1226350,1227091,1227165,1227423,1227964,1229347,1230398,1231569,1231572,1231627,1231640,1233605,1234555,1235135,1235137,1235956,1236456,1239752,1240897,1240928,1243065,1243104,1244766,1245751,1245762,1293419,1304099,1351818,1373683,1382409
svn commit: r1433998 - /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
Author: tgraves Date: Wed Jan 16 15:53:38 2013 New Revision: 1433998 URL: http://svn.apache.org/viewvc?rev=1433998&view=rev Log: Preparing for release 0.23.6 Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt 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=1433998&r1=1433997&r2=1433998&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 Wed Jan 16 15:53:38 2013 @@ -55,7 +55,7 @@ Release 0.23.6 - UNRELEASED HADOOP-9181. Set daemon flag for HttpServer's QueuedThreadPool (Liang Xie via tgraves) -Release 0.23.5 - UNRELEASED +Release 0.23.5 - 2012-11-28 INCOMPATIBLE CHANGES
svn commit: r1433882 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/security/Credentials.java src/main/java/org/apache/hadoop/se
Author: tomwhite Date: Wed Jan 16 10:26:21 2013 New Revision: 1433882 URL: http://svn.apache.org/viewvc?rev=1433882&view=rev Log: Merge -r 1433878:1433879 from trunk to branch-2. Fixes: HADOOP-9212. Potential deadlock in FileSystem.Cache/IPC/UGI. Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Credentials.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1433882&r1=1433881&r2=1433882&view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Wed Jan 16 10:26:21 2013 @@ -244,6 +244,8 @@ Release 2.0.3-alpha - Unreleased HADOOP-8816. HTTP Error 413 full HEAD if using kerberos authentication. (moritzmoeller via tucu) + +HADOOP-9212. Potential deadlock in FileSystem.Cache/IPC/UGI. (tomwhite) HADOOP-8589 ViewFs tests fail when tests and home dirs are nested. (sanjay Radia) Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Credentials.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Credentials.java?rev=1433882&r1=1433881&r2=1433882&view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Credentials.java (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Credentials.java Wed Jan 16 10:26:21 2013 @@ -18,10 +18,13 @@ package org.apache.hadoop.security; +import java.io.BufferedInputStream; import java.io.DataInput; import java.io.DataInputStream; import java.io.DataOutput; import java.io.DataOutputStream; +import java.io.File; +import java.io.FileInputStream; import java.io.IOException; import java.util.Arrays; import java.util.Collection; @@ -148,8 +151,32 @@ public class Credentials implements Writ in.close(); return credentials; } catch(IOException ioe) { + throw new IOException("Exception reading " + filename, ioe); +} finally { IOUtils.cleanup(LOG, in); +} + } + + /** + * Convenience method for reading a token storage file, and loading the Tokens + * therein in the passed UGI + * @param filename + * @param conf + * @throws IOException + */ + public static Credentials readTokenStorageFile(File filename, Configuration conf) + throws IOException { +DataInputStream in = null; +Credentials credentials = new Credentials(); +try { + in = new DataInputStream(new BufferedInputStream( + new FileInputStream(filename))); + credentials.readTokenStorageStream(in); + return credentials; +} catch(IOException ioe) { throw new IOException("Exception reading " + filename, ioe); +} finally { + IOUtils.cleanup(LOG, in); } } Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java?rev=1433882&r1=1433881&r2=1433882&view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java Wed Jan 16 10:26:21 2013 @@ -18,6 +18,7 @@ package org.apache.hadoop.security; +import java.io.File; import java.io.IOException; import java.lang.reflect.UndeclaredThrowableException; import java.security.AccessControlContext; @@ -645,10 +646,11 @@ public class UserGroupInformation { String fileLocation = System.getenv(HADOOP_TOKEN_FILE_LOCATION); if (fileLocation != null) { - // load the token storage file and put all of the tokens into the - // user. + // Load the token storage file and put all of the tokens into the + // user. Don't use the FileSystem API for reading since it has a lock + //
svn commit: r1433879 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/security/Credentials.java src/main/java/org/apache/hadoop/security/UserG
Author: tomwhite Date: Wed Jan 16 10:20:11 2013 New Revision: 1433879 URL: http://svn.apache.org/viewvc?rev=1433879&view=rev Log: HADOOP-9212. Potential deadlock in FileSystem.Cache/IPC/UGI. Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Credentials.java hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1433879&r1=1433878&r2=1433879&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Wed Jan 16 10:20:11 2013 @@ -554,6 +554,8 @@ Release 2.0.3-alpha - Unreleased HADOOP-8816. HTTP Error 413 full HEAD if using kerberos authentication. (moritzmoeller via tucu) + +HADOOP-9212. Potential deadlock in FileSystem.Cache/IPC/UGI. (tomwhite) Release 2.0.2-alpha - 2012-09-07 Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Credentials.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Credentials.java?rev=1433879&r1=1433878&r2=1433879&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Credentials.java (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Credentials.java Wed Jan 16 10:20:11 2013 @@ -18,10 +18,13 @@ package org.apache.hadoop.security; +import java.io.BufferedInputStream; import java.io.DataInput; import java.io.DataInputStream; import java.io.DataOutput; import java.io.DataOutputStream; +import java.io.File; +import java.io.FileInputStream; import java.io.IOException; import java.util.Arrays; import java.util.Collection; @@ -148,8 +151,32 @@ public class Credentials implements Writ in.close(); return credentials; } catch(IOException ioe) { + throw new IOException("Exception reading " + filename, ioe); +} finally { IOUtils.cleanup(LOG, in); +} + } + + /** + * Convenience method for reading a token storage file, and loading the Tokens + * therein in the passed UGI + * @param filename + * @param conf + * @throws IOException + */ + public static Credentials readTokenStorageFile(File filename, Configuration conf) + throws IOException { +DataInputStream in = null; +Credentials credentials = new Credentials(); +try { + in = new DataInputStream(new BufferedInputStream( + new FileInputStream(filename))); + credentials.readTokenStorageStream(in); + return credentials; +} catch(IOException ioe) { throw new IOException("Exception reading " + filename, ioe); +} finally { + IOUtils.cleanup(LOG, in); } } Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java?rev=1433879&r1=1433878&r2=1433879&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java Wed Jan 16 10:20:11 2013 @@ -20,6 +20,7 @@ package org.apache.hadoop.security; import static org.apache.hadoop.fs.CommonConfigurationKeys.HADOOP_KERBEROS_MIN_SECONDS_BEFORE_RELOGIN; import static org.apache.hadoop.fs.CommonConfigurationKeys.HADOOP_KERBEROS_MIN_SECONDS_BEFORE_RELOGIN_DEFAULT; +import java.io.File; import java.io.IOException; import java.lang.reflect.UndeclaredThrowableException; import java.security.AccessControlContext; @@ -656,10 +657,11 @@ public class UserGroupInformation { String fileLocation = System.getenv(HADOOP_TOKEN_FILE_LOCATION); if (fileLocation != null) { - // load the token storage file and put all of the tokens into the - // user. + // Load the token storage file and put all of the tokens into the + // user. Don't use the FileSystem API for reading since it has a lock + // cycle (HADOOP-9212). Credentials cred = Credentials.readTokenStorageF