svn commit: r1441078 - in /hadoop/common/branches/branch-1: CHANGES.txt src/test/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java src/test/org/apache/hadoop/mapreduce/lib/input/TestKeyValueTe
Author: suresh Date: Thu Jan 31 17:22:23 2013 New Revision: 1441078 URL: http://svn.apache.org/viewvc?rev=1441078&view=rev Log: MAPREDUCE-4969. TestKeyValueTextInputFormat test fails with Open JDK 7. Contributed by Arpit Agarwal. Modified: hadoop/common/branches/branch-1/CHANGES.txt hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/input/TestKeyValueTextInputFormat.java Modified: hadoop/common/branches/branch-1/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1441078&r1=1441077&r2=1441078&view=diff == --- hadoop/common/branches/branch-1/CHANGES.txt (original) +++ hadoop/common/branches/branch-1/CHANGES.txt Thu Jan 31 17:22:23 2013 @@ -462,6 +462,9 @@ Release 1.2.0 - unreleased HDFS-. Add space between total transaction time and number of transactions in FSEditLog#printStatistics. (Stephen Chu via suresh) +MAPREDUCE-4969. TestKeyValueTextInputFormat test fails with Open JDK 7. +(Arpit Agarwal via suresh) + Release 1.1.2 - Unreleased INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java?rev=1441078&r1=1441077&r2=1441078&view=diff == --- hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java (original) +++ hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java Thu Jan 31 17:22:23 2013 @@ -47,14 +47,10 @@ public class TestKeyValueTextInputFormat private static Path workDir = new Path(new Path(System.getProperty("test.build.data", "."), "data"), "TestKeyValueTextInputFormat"); - - private static Path workDirFormat = - new Path(new Path(System.getProperty("test.build.data", "."), "data"), - "TestKeyValueTextInputFormat-testFormat"); public void testFormat() throws Exception { JobConf job = new JobConf(); -Path file = new Path(workDirFormat, "test.txt"); +Path file = new Path(workDir, "test.txt"); // A reporter that does nothing Reporter reporter = Reporter.NULL; @@ -63,8 +59,8 @@ public class TestKeyValueTextInputFormat LOG.info("seed = "+seed); Random random = new Random(seed); -localFs.delete(workDirFormat, true); -FileInputFormat.setInputPaths(job, workDirFormat); +localFs.delete(workDir, true); +FileInputFormat.setInputPaths(job, workDir); // for a variety of lengths for (int length = 0; length < MAX_LENGTH; @@ -140,32 +136,47 @@ public class TestKeyValueTextInputFormat } public void testUTF8() throws Exception { -LineReader in = makeStream("abcd\u20acbdcd\u20ac"); -Text line = new Text(); -in.readLine(line); -assertEquals("readLine changed utf8 characters", - "abcd\u20acbdcd\u20ac", line.toString()); -in = makeStream("abc\u200axyz"); -in.readLine(line); -assertEquals("split on fake newline", "abc\u200axyz", line.toString()); +LineReader in = null; + +try { + in = makeStream("abcd\u20acbdcd\u20ac"); + Text line = new Text(); + in.readLine(line); + assertEquals("readLine changed utf8 characters", + "abcd\u20acbdcd\u20ac", line.toString()); + in = makeStream("abc\u200axyz"); + in.readLine(line); + assertEquals("split on fake newline", "abc\u200axyz", line.toString()); +} finally { + if (in != null) { +in.close(); + } +} } public void testNewLines() throws Exception { -LineReader in = makeStream("a\nbb\n\nccc\r\r\ne"); -Text out = new Text(); -in.readLine(out); -assertEquals("line1 length", 1, out.getLength()); -in.readLine(out); -assertEquals("line2 length", 2, out.getLength()); -in.readLine(out); -assertEquals("line3 length", 0, out.getLength()); -in.readLine(out); -assertEquals("line4 length", 3, out.getLength()); -in.readLine(out); -assertEquals("line5 length", 4, out.getLength()); -in.readLine(out); -assertEquals("line5 length", 5, out.getLength()); -assertEquals("end of file", 0, in.readLine(out)); +LineReader in = null; +try { + in = makeStream("a\nbb\n\nccc\r\r\ne"); + Text out = new Text(); + in.readLine(out); + assertEquals("line1 length", 1, out.getLength()); + in.readLine(out); + assertEquals("line2 length", 2, out.getLength()); + in.readLine(out); + assertEquals("line3 length", 0, out.getLength()); + in.readLine(out); + assertEquals("line4 length", 3, o
svn commit: r1441079 - in /hadoop/common/branches/branch-1-win: CHANGES.branch-1-win.txt src/test/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java src/test/org/apache/hadoop/mapreduce/lib/inp
Author: suresh Date: Thu Jan 31 17:27:56 2013 New Revision: 1441079 URL: http://svn.apache.org/viewvc?rev=1441079&view=rev Log: MAPREDUCE-4969. Merge change 1441078 from branch-1 Modified: hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/mapreduce/lib/input/TestKeyValueTextInputFormat.java Modified: hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt?rev=1441079&r1=1441078&r2=1441079&view=diff == --- hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt (original) +++ hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt Thu Jan 31 17:27:56 2013 @@ -340,3 +340,6 @@ Branch-hadoop-1-win (branched from branc HADOOP-9177. Address issues that reported by static code analysis on winutils. (Ivan Mitic via suresh) + +MAPREDUCE-4969. TestKeyValueTextInputFormat test fails with Open JDK 7. +(Arpit Agarwal via suresh) Modified: hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java?rev=1441079&r1=1441078&r2=1441079&view=diff == --- hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java (original) +++ hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java Thu Jan 31 17:27:56 2013 @@ -47,14 +47,10 @@ public class TestKeyValueTextInputFormat private static Path workDir = new Path(new Path(System.getProperty("test.build.data", "."), "data"), "TestKeyValueTextInputFormat"); - - private static Path workDirFormat = - new Path(new Path(System.getProperty("test.build.data", "."), "data"), - "TestKeyValueTextInputFormat-testFormat"); public void testFormat() throws Exception { JobConf job = new JobConf(); -Path file = new Path(workDirFormat, "test.txt"); +Path file = new Path(workDir, "test.txt"); // A reporter that does nothing Reporter reporter = Reporter.NULL; @@ -63,8 +59,8 @@ public class TestKeyValueTextInputFormat LOG.info("seed = "+seed); Random random = new Random(seed); -localFs.delete(workDirFormat, true); -FileInputFormat.setInputPaths(job, workDirFormat); +localFs.delete(workDir, true); +FileInputFormat.setInputPaths(job, workDir); // for a variety of lengths for (int length = 0; length < MAX_LENGTH; @@ -140,32 +136,47 @@ public class TestKeyValueTextInputFormat } public void testUTF8() throws Exception { -LineReader in = makeStream("abcd\u20acbdcd\u20ac"); -Text line = new Text(); -in.readLine(line); -assertEquals("readLine changed utf8 characters", - "abcd\u20acbdcd\u20ac", line.toString()); -in = makeStream("abc\u200axyz"); -in.readLine(line); -assertEquals("split on fake newline", "abc\u200axyz", line.toString()); +LineReader in = null; + +try { + in = makeStream("abcd\u20acbdcd\u20ac"); + Text line = new Text(); + in.readLine(line); + assertEquals("readLine changed utf8 characters", + "abcd\u20acbdcd\u20ac", line.toString()); + in = makeStream("abc\u200axyz"); + in.readLine(line); + assertEquals("split on fake newline", "abc\u200axyz", line.toString()); +} finally { + if (in != null) { +in.close(); + } +} } public void testNewLines() throws Exception { -LineReader in = makeStream("a\nbb\n\nccc\r\r\ne"); -Text out = new Text(); -in.readLine(out); -assertEquals("line1 length", 1, out.getLength()); -in.readLine(out); -assertEquals("line2 length", 2, out.getLength()); -in.readLine(out); -assertEquals("line3 length", 0, out.getLength()); -in.readLine(out); -assertEquals("line4 length", 3, out.getLength()); -in.readLine(out); -assertEquals("line5 length", 4, out.getLength()); -in.readLine(out); -assertEquals("line5 length", 5, out.getLength()); -assertEquals("end of file", 0, in.readLine(out)); +LineReader in = null; +try { + in = makeStream("a\nbb\n\nccc\r\r\ne"); + Text out = new Text(); + in.readLine(out); + assertEquals("line1 length", 1, out.getLength()); + in.readLine(out); + assertEquals("line2 length", 2, out.getLength()); + in.readLine(out); + assertEquals("line3 length", 0, out.getLength()); + in.readLine(out); + assertEquals("line4 length", 3, out.getLength(
svn commit: r1441084 - in /hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common: ./ src/main/java/org/apache/hadoop/fs/ src/main/winutils/
Author: suresh Date: Thu Jan 31 17:42:21 2013 New Revision: 1441084 URL: http://svn.apache.org/viewvc?rev=1441084&view=rev Log: HADOOP-9266. Fix javac, findbugs, and release audit warnings on branch-trunk-win. Contributed by Chris Nauroth. Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.branch-trunk-win.txt hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/pom.xml hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/winutils/libwinutils.vcxproj hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/winutils/winutils.sln hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/winutils/winutils.vcxproj Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.branch-trunk-win.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.branch-trunk-win.txt?rev=1441084&r1=1441083&r2=1441084&view=diff == --- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.branch-trunk-win.txt (original) +++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.branch-trunk-win.txt Thu Jan 31 17:42:21 2013 @@ -71,8 +71,11 @@ branch-trunk-win changes - unreleased HADOOP-9146. Fix sticky bit regression on branch-trunk-win. (Chris Nauroth via suresh) + HADOOP-9266. Fix javac, findbugs, and release audit warnings on + branch-trunk-win. (Chris Nauroth via suresh) + Patch equivalent to trunk committed to branch-trunk-win -HADOOP-8924. Add maven plugin alternative to shell script to save -package-info.java. (Chris Nauroth via suresh) + HADOOP-8924. Add maven plugin alternative to shell script to save + package-info.java. (Chris Nauroth via suresh) Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/pom.xml?rev=1441084&r1=1441083&r2=1441084&view=diff == --- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/pom.xml (original) +++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/pom.xml Thu Jan 31 17:42:21 2013 @@ -496,6 +496,7 @@ CHANGES.txt +CHANGES.branch-trunk-win.txt .idea/** src/main/conf/* src/main/docs/** @@ -507,6 +508,7 @@ src/test/all-tests src/test/resources/kdc/ldif/users.ldif src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4.c + src/test/java/org/apache/hadoop/fs/test-untar.tgz Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java?rev=1441084&r1=1441083&r2=1441084&view=diff == --- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java (original) +++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java Thu Jan 31 17:42:21 2013 @@ -1056,7 +1056,13 @@ public class FileUtil { StringUtils.ENV_VAR_PATTERN, env); } File workingDir = new File(pwd.toString()); -workingDir.mkdirs(); +if (!workingDir.mkdirs()) { + // If mkdirs returns false because the working directory already exists, + // then this is acceptable. If it returns false due to some other I/O + // error, then this method will fail later with an IOException while saving + // the jar. + LOG.debug("mkdirs false for " + workingDir + ", execution will continue"); +} // Append all entries List classPathEntryList = new ArrayList( Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java?rev=1441084&r1=1441083&r2=1441084&view=
svn commit: r1441131 - /hadoop/common/branches/branch-0.23/
Author: kihwal Date: Thu Jan 31 19:06:03 2013 New Revision: 1441131 URL: http://svn.apache.org/viewvc?rev=1441131&view=rev Log: Merging r1196676 and r1197801 from trunk to branch-0.23 to fix HDFS-2477 Modified: hadoop/common/branches/branch-0.23/ (props changed) Propchange: hadoop/common/branches/branch-0.23/ -- Merged /hadoop/common/trunk:r1196676,1197801
svn commit: r1441145 - in /hadoop/common/branches/branch-trunk-win: ./ hadoop-maven-plugins/pom.xml
Author: suresh Date: Thu Jan 31 19:15:32 2013 New Revision: 1441145 URL: http://svn.apache.org/viewvc?rev=1441145&view=rev Log: Merge trunk to branch-trunk-win Modified: hadoop/common/branches/branch-trunk-win/ (props changed) hadoop/common/branches/branch-trunk-win/hadoop-maven-plugins/pom.xml Propchange: hadoop/common/branches/branch-trunk-win/ -- Merged /hadoop/common/trunk:r1440148-1441084 Modified: hadoop/common/branches/branch-trunk-win/hadoop-maven-plugins/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-maven-plugins/pom.xml?rev=1441145&r1=1441144&r2=1441145&view=diff == --- hadoop/common/branches/branch-trunk-win/hadoop-maven-plugins/pom.xml (original) +++ hadoop/common/branches/branch-trunk-win/hadoop-maven-plugins/pom.xml Thu Jan 31 19:15:32 2013 @@ -71,6 +71,17 @@ + + +com.atlassian.maven.plugins +maven-clover2-plugin + + true + +
svn commit: r1441145 - in /hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common: ./ src/main/docs/ src/main/docs/src/documentation/content/xdocs/ src/main/java/ src/main/java/or
Author: suresh Date: Thu Jan 31 19:15:32 2013 New Revision: 1441145 URL: http://svn.apache.org/viewvc?rev=1441145&view=rev Log: Merge trunk to branch-trunk-win Added: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/site/apt/NativeLibraries.apt.vm - copied unchanged from r1441084, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/NativeLibraries.apt.vm hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/site/apt/ServiceLevelAuth.apt.vm - copied unchanged from r1441084, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/ServiceLevelAuth.apt.vm hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/site/apt/SingleNodeSetup.apt.vm - copied unchanged from r1441084, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/SingleNodeSetup.apt.vm hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/site/apt/Superusers.apt.vm - copied unchanged from r1441084, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/Superusers.apt.vm Removed: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/Superusers.xml hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/deployment_layout.xml hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/native_libraries.xml hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/service_level_auth.xml hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/single_node_setup.xml Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.txt (contents, props changed) hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/docs/ (props changed) hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/ (props changed) hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/Errno.java hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/NativeIO.java hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/errno_enum.c hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/test/core/ (props changed) hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/nativeio/TestNativeIO.java Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1441145&r1=1441144&r2=1441145&view=diff == --- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.txt Thu Jan 31 19:15:32 2013 @@ -149,9 +149,6 @@ Trunk (Unreleased) HADOOP-8924. Add maven plugin alternative to shell script to save package-info.java. (Chris Nauroth via suresh) -HADOOP-9245. mvn clean without running mvn install before fails. -(Karthik Kambatla via suresh) - BUG FIXES HADOOP-8419. Fixed GzipCode NPE reset for IBM JDK. (Yu Li via eyang) @@ -322,6 +319,12 @@ Trunk (Unreleased) HADOOP-9202. test-patch.sh fails during mvn eclipse:eclipse if patch adds a new module to the build (Chris Nauroth via bobby) +HADOOP-9245. mvn clean without running mvn install before fails. +(Karthik Kambatla via suresh) + +HADOOP-9249. hadoop-maven-plugins version-info goal causes build failure +when running with Clover. (Chris Nauroth via suresh) + OPTIMIZATIONS HADOOP-7761. Improve the performance of raw comparisons. (todd) @@ -583,6 +586,8 @@ Release 2.0.3-alpha - Unreleased HADOOP-8857. hadoop.http.authentication.signature.secret.file docs should not state that secret is randomly generated. (tucu) +HA
svn commit: r1441164 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: ./ src/main/java/org/apache/hadoop/fs/ src/test/java/org/apache/hadoop/fs/
Author: suresh Date: Thu Jan 31 19:45:28 2013 New Revision: 1441164 URL: http://svn.apache.org/viewvc?rev=1441164&view=rev Log: HADOOP-9264. Port change to use Java untar API on Windows from branch-1-win to trunk. Contributed by Chris Nauroth. Added: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/test-untar.tar (with props) hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/test-untar.tgz (with props) Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.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=1441164&r1=1441163&r2=1441164&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 31 19:45:28 2013 @@ -325,6 +325,9 @@ Trunk (Unreleased) HADOOP-9249. hadoop-maven-plugins version-info goal causes build failure when running with Clover. (Chris Nauroth via suresh) +HADOOP-9264. Port change to use Java untar API on Windows from +branch-1-win to trunk. (Chris Nauroth via suresh) + OPTIMIZATIONS HADOOP-7761. Improve the performance of raw comparisons. (todd) 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=1441164&r1=1441163&r2=1441164&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 31 19:45:28 2013 @@ -241,6 +241,11 @@ test-jar test + + org.apache.commons + commons-compress + 1.4 + @@ -382,6 +387,23 @@ +copy-test-tarballs +process-test-resources + + run + + + + + + + + + + + + + pre-site run @@ -485,6 +507,7 @@ src/test/all-tests src/test/resources/kdc/ldif/users.ldif src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4.c + src/test/java/org/apache/hadoop/fs/test-untar.tgz Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java?rev=1441164&r1=1441163&r2=1441164&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java Thu Jan 31 19:45:28 2013 @@ -21,9 +21,12 @@ package org.apache.hadoop.fs; import java.io.*; import java.util.Arrays; import java.util.Enumeration; +import java.util.zip.GZIPInputStream; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; +import org.apache.commons.compress.archivers.tar.TarArchiveEntry; +import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; @@ -624,14 +627,28 @@ public class FileUtil { * @throws IOException */ public static void unTar(File inFile, File untarDir) throws IOException { -if (!untarDir.mkdirs()) { +if (!untarDir.mkdirs()) { if (!untarDir.isDirectory()) { throw new IOException("Mkdirs failed to create " + untarDir); } } -StringBuilder untarCommand = new StringBuilder(); boolean gzipped = inFile.toString().endsWith("gz"); +if(Shell.WINDOWS) { + // Tar is not native to Windows. Use simple Java based implementation for + // tests and simple tar archives + unTarUsingJava(inFile, untarDir, gzipped); +} +else { + // spawn tar utility to untar archive for full fledged unix
svn commit: r1441166 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: ./ src/main/java/org/apache/hadoop/fs/ src/test/java/org/apache/hadoop/fs/
Author: suresh Date: Thu Jan 31 19:49:06 2013 New Revision: 1441166 URL: http://svn.apache.org/viewvc?rev=1441166&view=rev Log: HADOOP-9264. Reverting r1441164 and wait for Jenkins results before committing the patch. Removed: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/test-untar.tar hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/test-untar.tgz Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.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=1441166&r1=1441165&r2=1441166&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 31 19:49:06 2013 @@ -325,9 +325,6 @@ Trunk (Unreleased) HADOOP-9249. hadoop-maven-plugins version-info goal causes build failure when running with Clover. (Chris Nauroth via suresh) -HADOOP-9264. Port change to use Java untar API on Windows from -branch-1-win to trunk. (Chris Nauroth via suresh) - OPTIMIZATIONS HADOOP-7761. Improve the performance of raw comparisons. (todd) 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=1441166&r1=1441165&r2=1441166&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 31 19:49:06 2013 @@ -241,11 +241,6 @@ test-jar test - - org.apache.commons - commons-compress - 1.4 - @@ -387,23 +382,6 @@ -copy-test-tarballs -process-test-resources - - run - - - - - - - - - - - - - pre-site run @@ -507,7 +485,6 @@ src/test/all-tests src/test/resources/kdc/ldif/users.ldif src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4.c - src/test/java/org/apache/hadoop/fs/test-untar.tgz Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java?rev=1441166&r1=1441165&r2=1441166&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java Thu Jan 31 19:49:06 2013 @@ -21,12 +21,9 @@ package org.apache.hadoop.fs; import java.io.*; import java.util.Arrays; import java.util.Enumeration; -import java.util.zip.GZIPInputStream; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import org.apache.commons.compress.archivers.tar.TarArchiveEntry; -import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; @@ -627,28 +624,14 @@ public class FileUtil { * @throws IOException */ public static void unTar(File inFile, File untarDir) throws IOException { -if (!untarDir.mkdirs()) { +if (!untarDir.mkdirs()) { if (!untarDir.isDirectory()) { throw new IOException("Mkdirs failed to create " + untarDir); } } +StringBuilder untarCommand = new StringBuilder(); boolean gzipped = inFile.toString().endsWith("gz"); -if(Shell.WINDOWS) { - // Tar is not native to Windows. Use simple Java based implementation for - // tests and simple tar archives - unTarUsingJava(inFile, untarDir, gzipped); -} -else { - // spawn tar utility to untar archive for full fledged unix behavior such - // as resolving symlinks in tar a
svn commit: r1441172 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: ./ src/main/java/org/apache/hadoop/fs/ src/test/java/org/apache/hadoop/fs/
Author: suresh Date: Thu Jan 31 20:13:01 2013 New Revision: 1441172 URL: http://svn.apache.org/viewvc?rev=1441172&view=rev Log: HADOOP-9264. Port change to use Java untar API on Windows from branch-1-win to trunk. Contributed by Chris Nauroth. Added: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/test-untar.tar (with props) hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/test-untar.tgz (with props) Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.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=1441172&r1=1441171&r2=1441172&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 31 20:13:01 2013 @@ -325,6 +325,9 @@ Trunk (Unreleased) HADOOP-9249. hadoop-maven-plugins version-info goal causes build failure when running with Clover. (Chris Nauroth via suresh) +HADOOP-9264. Port change to use Java untar API on Windows from +branch-1-win to trunk. (Chris Nauroth via suresh) + OPTIMIZATIONS HADOOP-7761. Improve the performance of raw comparisons. (todd) 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=1441172&r1=1441171&r2=1441172&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 31 20:13:01 2013 @@ -241,6 +241,11 @@ test-jar test + + org.apache.commons + commons-compress + 1.4 + @@ -382,6 +387,23 @@ +copy-test-tarballs +process-test-resources + + run + + + + + + + + + + + + + pre-site run @@ -485,6 +507,7 @@ src/test/all-tests src/test/resources/kdc/ldif/users.ldif src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4.c + src/test/java/org/apache/hadoop/fs/test-untar.tgz Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java?rev=1441172&r1=1441171&r2=1441172&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java Thu Jan 31 20:13:01 2013 @@ -21,9 +21,12 @@ package org.apache.hadoop.fs; import java.io.*; import java.util.Arrays; import java.util.Enumeration; +import java.util.zip.GZIPInputStream; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; +import org.apache.commons.compress.archivers.tar.TarArchiveEntry; +import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; @@ -624,14 +627,28 @@ public class FileUtil { * @throws IOException */ public static void unTar(File inFile, File untarDir) throws IOException { -if (!untarDir.mkdirs()) { +if (!untarDir.mkdirs()) { if (!untarDir.isDirectory()) { throw new IOException("Mkdirs failed to create " + untarDir); } } -StringBuilder untarCommand = new StringBuilder(); boolean gzipped = inFile.toString().endsWith("gz"); +if(Shell.WINDOWS) { + // Tar is not native to Windows. Use simple Java based implementation for + // tests and simple tar archives + unTarUsingJava(inFile, untarDir, gzipped); +} +else { + // spawn tar utility to untar archive for full fledged unix
svn commit: r1441185 - in /hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common: CHANGES.branch-trunk-win.txt src/main/java/org/apache/hadoop/fs/FileUtil.java
Author: szetszwo Date: Thu Jan 31 20:52:59 2013 New Revision: 1441185 URL: http://svn.apache.org/viewvc?rev=1441185&view=rev Log: HADOOP-9270. Remove a stale java comment from FileUtil. Contributed by Chris Nauroth Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.branch-trunk-win.txt hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.branch-trunk-win.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.branch-trunk-win.txt?rev=1441185&r1=1441184&r2=1441185&view=diff == --- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.branch-trunk-win.txt (original) +++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.branch-trunk-win.txt Thu Jan 31 20:52:59 2013 @@ -74,6 +74,9 @@ branch-trunk-win changes - unreleased HADOOP-9266. Fix javac, findbugs, and release audit warnings on branch-trunk-win. (Chris Nauroth via suresh) + HADOOP-9270. Remove a stale java comment from FileUtil. (Chris Nauroth via + szetszwo) + Patch equivalent to trunk committed to branch-trunk-win HADOOP-8924. Add maven plugin alternative to shell script to save Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java?rev=1441185&r1=1441184&r2=1441185&view=diff == --- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java (original) +++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java Thu Jan 31 20:52:59 2013 @@ -643,8 +643,6 @@ public class FileUtil { untarCommand.append("cd '"); untarCommand.append(FileUtil.makeShellPath(untarDir)); untarCommand.append("' ; "); - -// Force the archive path as local on Windows as it can have a colon untarCommand.append("tar -xf "); if (gzipped) {
svn commit: r1441206 - /hadoop/common/branches/HDFS-2802/
Author: szetszwo Date: Thu Jan 31 21:39:42 2013 New Revision: 1441206 URL: http://svn.apache.org/viewvc?rev=1441206&view=rev Log: Merge r1440222 through r1441205 from trunk. Modified: hadoop/common/branches/HDFS-2802/ (props changed) Propchange: hadoop/common/branches/HDFS-2802/ -- Merged /hadoop/common/trunk:r1440222-1441205
svn commit: r1441206 - in /hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common: ./ src/main/docs/ src/main/docs/src/documentation/content/xdocs/ src/main/java/ src/main/java/org/apach
Author: szetszwo Date: Thu Jan 31 21:39:42 2013 New Revision: 1441206 URL: http://svn.apache.org/viewvc?rev=1441206&view=rev Log: Merge r1440222 through r1441205 from trunk. Added: hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/site/apt/NativeLibraries.apt.vm - copied unchanged from r1441205, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/NativeLibraries.apt.vm hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/site/apt/ServiceLevelAuth.apt.vm - copied unchanged from r1441205, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/ServiceLevelAuth.apt.vm hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/site/apt/SingleNodeSetup.apt.vm - copied unchanged from r1441205, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/SingleNodeSetup.apt.vm hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/site/apt/Superusers.apt.vm - copied unchanged from r1441205, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/Superusers.apt.vm hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/test-untar.tar - copied unchanged from r1441205, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/test-untar.tar hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/test-untar.tgz - copied unchanged from r1441205, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/test-untar.tgz Removed: hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/Superusers.xml hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/deployment_layout.xml hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/native_libraries.xml hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/service_level_auth.xml hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/single_node_setup.xml Modified: hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/CHANGES.txt (contents, props changed) hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/pom.xml hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/docs/ (props changed) hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/ (props changed) hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/Errno.java hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/NativeIO.java hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/errno_enum.c hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/core/ (props changed) hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/nativeio/TestNativeIO.java hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java Modified: hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1441206&r1=1441205&r2=1441206&view=diff == --- hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/CHANGES.txt Thu Jan 31 21:39:42 2013 @@ -325,6 +325,9 @@ Trunk (Unreleased) HADOOP-9249. hadoop-maven-plugins version-info goal causes build failure when running with Clover. (Chris Nauroth via suresh) +HADOOP-9264. Port chan
svn commit: r1441218 - /hadoop/common/branches/branch-trunk-win/
Author: suresh Date: Thu Jan 31 22:05:39 2013 New Revision: 1441218 URL: http://svn.apache.org/viewvc?rev=1441218&view=rev Log: Merge trunk to branch-trunk-win Modified: hadoop/common/branches/branch-trunk-win/ (props changed) Propchange: hadoop/common/branches/branch-trunk-win/ -- Merged /hadoop/common/trunk:r1441085-1441213
svn commit: r1441218 - in /hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common: CHANGES.txt src/main/docs/ src/main/java/ src/test/core/
Author: suresh Date: Thu Jan 31 22:05:39 2013 New Revision: 1441218 URL: http://svn.apache.org/viewvc?rev=1441218&view=rev Log: Merge trunk to branch-trunk-win Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.txt (contents, props changed) hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/docs/ (props changed) hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/ (props changed) hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/test/core/ (props changed) Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1441218&r1=1441217&r2=1441218&view=diff == --- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.txt Thu Jan 31 22:05:39 2013 @@ -325,6 +325,9 @@ Trunk (Unreleased) HADOOP-9249. hadoop-maven-plugins version-info goal causes build failure when running with Clover. (Chris Nauroth via suresh) +HADOOP-9264. Port change to use Java untar API on Windows from +branch-1-win to trunk. (Chris Nauroth via suresh) + OPTIMIZATIONS HADOOP-7761. Improve the performance of raw comparisons. (todd) Propchange: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.txt -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1441085-1441213 Propchange: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/docs/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1441085-1441213 Propchange: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/main/java/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1441085-1441213 Propchange: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/src/test/core/ -- Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:r1441085-1441213
svn commit: r1441225 - in /hadoop/common/branches/branch-0.23/hadoop-common-project: hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/ hadoop-auth/src/main/java/org/apache/ha
Author: tgraves Date: Thu Jan 31 22:19:49 2013 New Revision: 1441225 URL: http://svn.apache.org/viewvc?rev=1441225&view=rev Log: HADOOP-6941. Support non-SUN JREs in UserGroupInformation (Devaraj Das via tgraves Added: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosUtil.java - copied, changed from r1301308, hadoop/common/trunk/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosUtil.java Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/KerberosAuthenticationHandler.java hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosName.java hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/KerberosTestUtils.java hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestKerberosAuthenticationHandler.java 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/security/HadoopKerberosName.java hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java?rev=1441225&r1=1441224&r2=1441225&view=diff == --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java Thu Jan 31 22:19:49 2013 @@ -13,12 +13,12 @@ */ package org.apache.hadoop.security.authentication.client; -import com.sun.security.auth.module.Krb5LoginModule; import org.apache.commons.codec.binary.Base64; +import org.apache.hadoop.security.authentication.util.KerberosUtil; import org.ietf.jgss.GSSContext; import org.ietf.jgss.GSSManager; import org.ietf.jgss.GSSName; -import sun.security.jgss.GSSUtil; +import org.ietf.jgss.Oid; import javax.security.auth.Subject; import javax.security.auth.login.AppConfigurationEntry; @@ -26,6 +26,7 @@ import javax.security.auth.login.Configu import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; import java.io.IOException; +import java.lang.reflect.Field; import java.net.HttpURLConnection; import java.net.URL; import java.security.AccessControlContext; @@ -97,7 +98,7 @@ public class KerberosAuthenticator imple } private static final AppConfigurationEntry USER_KERBEROS_LOGIN = - new AppConfigurationEntry(Krb5LoginModule.class.getName(), + new AppConfigurationEntry(KerberosUtil.getKrb5LoginModuleName(), AppConfigurationEntry.LoginModuleControlFlag.OPTIONAL, USER_KERBEROS_OPTIONS); @@ -109,7 +110,7 @@ public class KerberosAuthenticator imple return USER_KERBEROS_CONF; } } - + private URL url; private HttpURLConnection conn; private Base64 base64; @@ -195,9 +196,12 @@ public class KerberosAuthenticator imple try { GSSManager gssManager = GSSManager.getInstance(); String servicePrincipal = "HTTP/" + KerberosAuthenticator.this.url.getHost(); + GSSName serviceName = gssManager.createName(servicePrincipal, - GSSUtil.NT_GSS_KRB5_PRINCIPAL); -gssContext = gssManager.createContext(serviceName, GSSUtil.GSS_KRB5_MECH_OID, null, + GSSName.NT_HOSTBASED_SERVICE); +Oid oid = KerberosUtil.getOidClassInstance(servicePrincipal, +gssManager); +gssContext = gssManager.createContext(serviceName, oid, null,
svn commit: r1441227 - in /hadoop/common/branches/branch-0.23/hadoop-common-project: hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/ hadoop-auth/src/main/java/org/apache/ha
Author: tgraves Date: Thu Jan 31 22:24:26 2013 New Revision: 1441227 URL: http://svn.apache.org/viewvc?rev=1441227&view=rev Log: HADOOP-8346. Changes to support Kerberos with non Sun JVM (HADOOP-6941) broke SPNEGO (Devaraj Das via tgraves) Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosUtil.java hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestKerberosAuthenticationHandler.java hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java?rev=1441227&r1=1441226&r2=1441227&view=diff == --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java Thu Jan 31 22:24:26 2013 @@ -26,7 +26,6 @@ import javax.security.auth.login.Configu import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; import java.io.IOException; -import java.lang.reflect.Field; import java.net.HttpURLConnection; import java.net.URL; import java.security.AccessControlContext; @@ -196,11 +195,10 @@ public class KerberosAuthenticator imple try { GSSManager gssManager = GSSManager.getInstance(); String servicePrincipal = "HTTP/" + KerberosAuthenticator.this.url.getHost(); - +Oid oid = KerberosUtil.getOidInstance("NT_GSS_KRB5_PRINCIPAL"); GSSName serviceName = gssManager.createName(servicePrincipal, - GSSName.NT_HOSTBASED_SERVICE); -Oid oid = KerberosUtil.getOidClassInstance(servicePrincipal, -gssManager); +oid); +oid = KerberosUtil.getOidInstance("GSS_KRB5_MECH_OID"); gssContext = gssManager.createContext(serviceName, oid, null, GSSContext.DEFAULT_LIFETIME); gssContext.requestCredDeleg(true); Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosUtil.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosUtil.java?rev=1441227&r1=1441226&r2=1441227&view=diff == --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosUtil.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosUtil.java Thu Jan 31 22:24:26 2013 @@ -22,7 +22,6 @@ import java.lang.reflect.InvocationTarge import java.lang.reflect.Method; import org.ietf.jgss.GSSException; -import org.ietf.jgss.GSSManager; import org.ietf.jgss.Oid; public class KerberosUtil { @@ -34,8 +33,7 @@ public class KerberosUtil { : "com.sun.security.auth.module.Krb5LoginModule"; } - public static Oid getOidClassInstance(String servicePrincipal, - GSSManager gssManager) + public static Oid getOidInstance(String oidName) throws ClassNotFoundException, GSSException, NoSuchFieldException, IllegalAccessException { Class oidClass; @@ -44,7 +42,7 @@ public class KerberosUtil { } else { oidClass = Class.forName("sun.security.jgss.GSSUtil"); } -Field oidField = oidClass.getDeclaredField("GSS_KRB5_MECH_OID"); +Field oidField = oidClass.getDeclaredField(oidName); return (Oid)oidField.get(oidClass); } Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/server/TestKerberosAuthenticationHandler.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/auth
svn commit: r1441230 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/security/SecurityUtil.java
Author: tgraves Date: Thu Jan 31 22:27:22 2013 New Revision: 1441230 URL: http://svn.apache.org/viewvc?rev=1441230&view=rev Log: HADOOP-8251. Fix SecurityUtil.fetchServiceTicket after HADOOP-6941 (todd via tgraves) 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/security/SecurityUtil.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=1441230&r1=1441229&r2=1441230&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 Jan 31 22:27:22 2013 @@ -43,6 +43,9 @@ Release 0.23.7 - UNRELEASED HADOOP-8346. Changes to support Kerberos with non Sun JVM (HADOOP-6941) broke SPNEGO (Devaraj Das via tgraves) +HADOOP-8251. Fix SecurityUtil.fetchServiceTicket after HADOOP-6941 (todd +via tgraves) + 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/security/SecurityUtil.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java?rev=1441230&r1=1441229&r2=1441230&view=diff == --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java Thu Jan 31 22:27:22 2013 @@ -170,7 +170,7 @@ public class SecurityUtil { } else { principalClass = Class.forName("sun.security.krb5.PrincipalName"); credentialsClass = Class.forName("sun.security.krb5.Credentials"); -krb5utilClass = Class.forName("sun.security.jgss.krb5"); +krb5utilClass = Class.forName("sun.security.jgss.krb5.Krb5Util"); } @SuppressWarnings("rawtypes") Constructor principalConstructor = principalClass.getConstructor(String.class,
svn commit: r1441236 - in /hadoop/common/branches/branch-0.23/hadoop-common-project: hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/ hadoop-auth/src/main/java/org/apache/ha
Author: tgraves Date: Thu Jan 31 22:38:32 2013 New Revision: 1441236 URL: http://svn.apache.org/viewvc?rev=1441236&view=rev Log: HADOOP-8878. uppercase namenode hostname causes hadoop dfs calls with webhdfs filesystem and fsck to fail when security is on (Arpit Gupta via tgraves) Added: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/util/TestKerberosUtil.java Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosUtil.java hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java?rev=1441236&r1=1441235&r2=1441236&view=diff == --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java Thu Jan 31 22:38:32 2013 @@ -194,7 +194,8 @@ public class KerberosAuthenticator imple GSSContext gssContext = null; try { GSSManager gssManager = GSSManager.getInstance(); -String servicePrincipal = "HTTP/" + KerberosAuthenticator.this.url.getHost(); +String servicePrincipal = KerberosUtil.getServicePrincipal("HTTP", +KerberosAuthenticator.this.url.getHost()); Oid oid = KerberosUtil.getOidInstance("NT_GSS_KRB5_PRINCIPAL"); GSSName serviceName = gssManager.createName(servicePrincipal, oid); Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosUtil.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosUtil.java?rev=1441236&r1=1441235&r2=1441236&view=diff == --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosUtil.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosUtil.java Thu Jan 31 22:38:32 2013 @@ -20,6 +20,9 @@ package org.apache.hadoop.security.authe import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.Locale; import org.ietf.jgss.GSSException; import org.ietf.jgss.Oid; @@ -65,4 +68,33 @@ public class KerberosUtil { new Class[0]); return (String)getDefaultRealmMethod.invoke(kerbConf, new Object[0]); } + + /* Return fqdn of the current host */ + static String getLocalHostName() throws UnknownHostException { +return InetAddress.getLocalHost().getCanonicalHostName(); + } + + /** + * Create Kerberos principal for a given service and hostname. It converts + * hostname to lower case. If hostname is null or "0.0.0.0", it uses + * dynamically looked-up fqdn of the current host instead. + * + * @param service + * Service for which you want to generate the principal. + * @param hostname + * Fully-qualified domain name. + * @return Converted Kerberos principal name. + * @throws UnknownHostException + * If no IP address for the local host could be found. + */ + public static final String getServicePrincipal(String service, String hostname) + throws UnknownHostException { +String fqdn = hostname; +if (null == fqdn || fqdn.equals("") || fqdn.equals("0.0.0.0")) { + fqdn = getLocalHostName(); +} +// convert hostname to lowercase as kerberos does not work with hostnames +// with uppercase characters. +return service + "/" + fqdn.toLowerCase(Locale.US); + } } Added: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/util/TestKerberosUtil.java URL: http://svn.apache.or
svn commit: r1441239 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm
Author: jlowe Date: Thu Jan 31 22:46:05 2013 New Revision: 1441239 URL: http://svn.apache.org/viewvc?rev=1441239&view=rev Log: YARN-364. AggregatedLogDeletionService can take too long to delete logs. Contributed by Jason Lowe Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm?rev=1441239&r1=1441238&r2=1441239&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm Thu Jan 31 22:46:05 2013 @@ -325,6 +325,13 @@ Hadoop MapReduce Next Generation - Clust | | | How long to keep aggregation logs before deleting them. -1 disables. | | | | Be careful, set this too small and you will spam the name node. | *-+-++ +| <<>> | | | +| | <-1> | | +| | | Time between checks for aggregated log retention. If set to 0 or a | +| | | negative value then the value is computed as one-tenth of the | +| | | aggregated log retention time. | +| | | Be careful, set this too small and you will spam the name node. | +*-+-++
svn commit: r1441242 - /hadoop/common/tags/release-1.1.2-rc0/
Author: mattf Date: Thu Jan 31 22:50:01 2013 New Revision: 1441242 URL: http://svn.apache.org/viewvc?rev=1441242&view=rev Log: cleanup after posting 1.1.2-rc5 Removed: hadoop/common/tags/release-1.1.2-rc0/
svn commit: r1441243 - /hadoop/common/tags/release-1.1.2-rc1/
Author: mattf Date: Thu Jan 31 22:50:20 2013 New Revision: 1441243 URL: http://svn.apache.org/viewvc?rev=1441243&view=rev Log: cleanup after posting 1.1.2-rc5 Removed: hadoop/common/tags/release-1.1.2-rc1/
svn commit: r1441244 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm
Author: jlowe Date: Thu Jan 31 22:51:49 2013 New Revision: 1441244 URL: http://svn.apache.org/viewvc?rev=1441244&view=rev Log: svn merge -c 1441239 FIXES: YARN-364. AggregatedLogDeletionService can take too long to delete logs. Contributed by Jason Lowe Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm?rev=1441244&r1=1441243&r2=1441244&view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm Thu Jan 31 22:51:49 2013 @@ -325,6 +325,13 @@ Hadoop MapReduce Next Generation - Clust | | | How long to keep aggregation logs before deleting them. -1 disables. | | | | Be careful, set this too small and you will spam the name node. | *-+-++ +| <<>> | | | +| | <-1> | | +| | | Time between checks for aggregated log retention. If set to 0 or a | +| | | negative value then the value is computed as one-tenth of the | +| | | aggregated log retention time. | +| | | Be careful, set this too small and you will spam the name node. | +*-+-++
svn commit: r1441246 - /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm
Author: jlowe Date: Thu Jan 31 22:55:00 2013 New Revision: 1441246 URL: http://svn.apache.org/viewvc?rev=1441246&view=rev Log: svn merge -c 1441239 FIXES: YARN-364. AggregatedLogDeletionService can take too long to delete logs. Contributed by Jason Lowe Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm?rev=1441246&r1=1441245&r2=1441246&view=diff == --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm Thu Jan 31 22:55:00 2013 @@ -325,6 +325,13 @@ Hadoop MapReduce Next Generation - Clust | | | How long to keep aggregation logs before deleting them. -1 disables. | | | | Be careful, set this too small and you will spam the name node. | *-+-++ +| <<>> | | | +| | <-1> | | +| | | Time between checks for aggregated log retention. If set to 0 or a | +| | | negative value then the value is computed as one-tenth of the | +| | | aggregated log retention time. | +| | | Be careful, set this too small and you will spam the name node. | +*-+-++
svn commit: r1441249 - /hadoop/common/branches/branch-0.23/
Author: kihwal Date: Thu Jan 31 23:05:13 2013 New Revision: 1441249 URL: http://svn.apache.org/viewvc?rev=1441249&view=rev Log: merge -r 1199023:1199024 Merging from trunk to branch-0.23 to fix HDFS-2495 Modified: hadoop/common/branches/branch-0.23/ (props changed) Propchange: hadoop/common/branches/branch-0.23/ -- Merged /hadoop/common/trunk:r1199024