svn commit: r1456212 - /hadoop/common/trunk/hadoop-dist/pom.xml
Author: jlowe Date: Wed Mar 13 22:25:47 2013 New Revision: 1456212 URL: http://svn.apache.org/r1456212 Log: HADOOP-9397. Incremental dist tar build fails. Contributed by Chris Nauroth Modified: hadoop/common/trunk/hadoop-dist/pom.xml Modified: hadoop/common/trunk/hadoop-dist/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-dist/pom.xml?rev=1456212&r1=1456211&r2=1456212&view=diff == --- hadoop/common/trunk/hadoop-dist/pom.xml (original) +++ hadoop/common/trunk/hadoop-dist/pom.xml Wed Mar 13 22:25:47 2013 @@ -152,7 +152,7 @@ } run tar cf hadoop-${project.version}.tar hadoop-${project.version} - run gzip hadoop-${project.version}.tar + run gzip -f hadoop-${project.version}.tar echo echo "Hadoop dist tar available at: ${project.build.directory}/hadoop-${project.version}.tar.gz" echo
svn commit: r1456212 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
Author: jlowe Date: Wed Mar 13 22:25:47 2013 New Revision: 1456212 URL: http://svn.apache.org/r1456212 Log: HADOOP-9397. Incremental dist tar build fails. Contributed by Chris Nauroth 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=1456212&r1=1456211&r2=1456212&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Wed Mar 13 22:25:47 2013 @@ -348,6 +348,8 @@ Trunk (Unreleased) HADOOP-9099. NetUtils.normalizeHostName fails on domains where UnknownHost resolves to an IP address. (Ivan Mitic via suresh) +HADOOP-9397. Incremental dist tar build fails (Chris Nauroth via jlowe) + OPTIMIZATIONS HADOOP-7761. Improve the performance of raw comparisons. (todd)
svn commit: r1456109 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java
Author: atm Date: Wed Mar 13 19:56:03 2013 New Revision: 1456109 URL: http://svn.apache.org/r1456109 Log: HDFS-4591. HA clients can fail to fail over while Standby NN is performing long checkpoint. Contributed by Aaron T. Myers. Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java?rev=1456109&r1=1456108&r2=1456109&view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java Wed Mar 13 19:56:03 2013 @@ -162,6 +162,9 @@ public abstract class GenericTestUtils { private final CountDownLatch waitLatch = new CountDownLatch(1); private final CountDownLatch resultLatch = new CountDownLatch(1); +private final AtomicInteger fireCounter = new AtomicInteger(0); +private final AtomicInteger resultCounter = new AtomicInteger(0); + // Result fields set after proceed() is called. private volatile Throwable thrown; private volatile Object returnValue; @@ -188,6 +191,7 @@ public abstract class GenericTestUtils { @Override public Object answer(InvocationOnMock invocation) throws Throwable { LOG.info("DelayAnswer firing fireLatch"); + fireCounter.getAndIncrement(); fireLatch.countDown(); try { LOG.info("DelayAnswer waiting on waitLatch"); @@ -208,6 +212,7 @@ public abstract class GenericTestUtils { thrown = t; throw t; } finally { +resultCounter.incrementAndGet(); resultLatch.countDown(); } } @@ -235,6 +240,14 @@ public abstract class GenericTestUtils { public Object getReturnValue() { return returnValue; } + +public int getFireCount() { + return fireCounter.get(); +} + +public int getResultCount() { + return resultCounter.get(); +} } /**
svn commit: r1456107 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java
Author: atm Date: Wed Mar 13 19:51:19 2013 New Revision: 1456107 URL: http://svn.apache.org/r1456107 Log: HDFS-4591. HA clients can fail to fail over while Standby NN is performing long checkpoint. Contributed by Aaron T. Myers. Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java?rev=1456107&r1=1456106&r2=1456107&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java Wed Mar 13 19:51:19 2013 @@ -162,6 +162,9 @@ public abstract class GenericTestUtils { private final CountDownLatch waitLatch = new CountDownLatch(1); private final CountDownLatch resultLatch = new CountDownLatch(1); +private final AtomicInteger fireCounter = new AtomicInteger(0); +private final AtomicInteger resultCounter = new AtomicInteger(0); + // Result fields set after proceed() is called. private volatile Throwable thrown; private volatile Object returnValue; @@ -188,6 +191,7 @@ public abstract class GenericTestUtils { @Override public Object answer(InvocationOnMock invocation) throws Throwable { LOG.info("DelayAnswer firing fireLatch"); + fireCounter.getAndIncrement(); fireLatch.countDown(); try { LOG.info("DelayAnswer waiting on waitLatch"); @@ -208,6 +212,7 @@ public abstract class GenericTestUtils { thrown = t; throw t; } finally { +resultCounter.incrementAndGet(); resultLatch.countDown(); } } @@ -235,6 +240,14 @@ public abstract class GenericTestUtils { public Object getReturnValue() { return returnValue; } + +public int getFireCount() { + return fireCounter.get(); +} + +public int getResultCount() { + return resultCounter.get(); +} } /**
[Hadoop Wiki] Update of "HowToRelease" by SteveLoughran
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Hadoop Wiki" for change notification. The "HowToRelease" page has been changed by SteveLoughran: http://wiki.apache.org/hadoop/HowToRelease?action=diff&rev1=87&rev2=88 Comment: 2.x docs doesn't have a native libs page, so fix to 1.1.2 version To build an official release, you must: - 1. Use a 64-bit Linux system, so that we can [[http://hadoop.apache.org/common/docs/current/native_libraries.html|build native code]] for both 32- and 64-bit architectures. + 1. Use a 64-bit Linux system, so that we can [[http://hadoop.apache.org/docs/r1.1.2/native_libraries.html|build native code]] for both 32- and 64-bit architectures. 1. Have a recent version of [[http://www.eclipse.org/|Eclipse]] installed, so that the eclipse plugin will build.
svn commit: r1455974 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/http/HttpServer.java src/test/java/org/apache/hadoop/http
Author: daryn Date: Wed Mar 13 14:51:01 2013 New Revision: 1455974 URL: http://svn.apache.org/r1455974 Log: HADOOP-8816. HTTP Error 413 full HEAD if using kerberos authentication (daryn) 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/http/HttpServer.java hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.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=1455974&r1=1455973&r2=1455974&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 Mar 13 14:51:01 2013 @@ -114,6 +114,9 @@ Release 0.23.7 - UNRELEASED HADOOP-9339. IPC.Server incorrectly sets UGI auth type (Daryn Sharp via kihwal) +HADOOP-8816. HTTP Error 413 full HEAD if using kerberos authentication +(daryn) + Release 0.23.6 - 2013-02-06 INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java?rev=1455974&r1=1455973&r2=1455974&view=diff == --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java Wed Mar 13 14:51:01 2013 @@ -274,6 +274,7 @@ public class HttpServer implements Filte ret.setAcceptQueueSize(128); ret.setResolveNames(false); ret.setUseDirectBuffers(false); +ret.setHeaderBufferSize(1024*64); return ret; } Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java?rev=1455974&r1=1455973&r2=1455974&view=diff == --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java Wed Mar 13 14:51:01 2013 @@ -118,6 +118,18 @@ public class TestHttpServer extends Http } @SuppressWarnings("serial") + public static class LongHeaderServlet extends HttpServlet { +@SuppressWarnings("unchecked") +@Override +public void doGet(HttpServletRequest request, + HttpServletResponse response +) throws ServletException, IOException { + Assert.assertEquals(63*1024, request.getHeader("longheader").length()); + response.setStatus(HttpServletResponse.SC_OK); +} + } + + @SuppressWarnings("serial") public static class HtmlContentServlet extends HttpServlet { @Override public void doGet(HttpServletRequest request, @@ -137,6 +149,7 @@ public class TestHttpServer extends Http server.addServlet("echo", "/echo", EchoServlet.class); server.addServlet("echomap", "/echomap", EchoMapServlet.class); server.addServlet("htmlcontent", "/htmlcontent", HtmlContentServlet.class); +server.addServlet("longheader", "/longheader", LongHeaderServlet.class); server.addJerseyResourcePackage( JerseyResource.class.getPackage().getName(), "/jersey/*"); server.start(); @@ -195,6 +208,18 @@ public class TestHttpServer extends Http readOutput(new URL(baseUrl, "/echomap?a=b&c<=d&a=>"))); } + /** Test the echo map servlet that uses getParameterMap. */ + @Test public void testLongHeader() throws Exception { +URL url = new URL(baseUrl, "/longheader"); +HttpURLConnection conn = (HttpURLConnection) url.openConnection(); +StringBuilder sb = new StringBuilder(); +for (int i = 0 ; i < 63 * 1024; i++) { + sb.append("a"); +} +conn.setRequestProperty("longheader", sb.toString()); +assertEquals(HttpURLConnection.HTTP_OK, conn.getResponseCode()); + } + @Test public void testContentTypes() throws Exception { // Static CSS files should have text/css URL cssUrl = new URL(baseUrl, "/static/test.c
svn commit: r1455963 - in /hadoop/common/branches/branch-1.2: CHANGES.txt src/core/org/apache/hadoop/security/UserGroupInformation.java src/test/org/apache/hadoop/security/TestUserGroupInformation.jav
Author: suresh Date: Wed Mar 13 14:36:42 2013 New Revision: 1455963 URL: http://svn.apache.org/r1455963 Log: HADOOP-7101. Merge change 1455953 from branch-1 Modified: hadoop/common/branches/branch-1.2/CHANGES.txt hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/security/UserGroupInformation.java hadoop/common/branches/branch-1.2/src/test/org/apache/hadoop/security/TestUserGroupInformation.java Modified: hadoop/common/branches/branch-1.2/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/CHANGES.txt?rev=1455963&r1=1455962&r2=1455963&view=diff == --- hadoop/common/branches/branch-1.2/CHANGES.txt (original) +++ hadoop/common/branches/branch-1.2/CHANGES.txt Wed Mar 13 14:36:42 2013 @@ -523,6 +523,9 @@ Release 1.2.0 - unreleased HADOOP-9379. capture the ulimit info after printing the log to the console. (Arpit Gupta via suresh) +HADOOP-7101. UserGroupInformation.getCurrentUser() fails when called from +non-Hadoop JAAS context. (todd, backported by suresh) + Release 1.1.2 - 2013.01.30 INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/security/UserGroupInformation.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/security/UserGroupInformation.java?rev=1455963&r1=1455962&r2=1455963&view=diff == --- hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/security/UserGroupInformation.java (original) +++ hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/security/UserGroupInformation.java Wed Mar 13 14:36:42 2013 @@ -465,7 +465,11 @@ public class UserGroupInformation { static UserGroupInformation getCurrentUser() throws IOException { AccessControlContext context = AccessController.getContext(); Subject subject = Subject.getSubject(context); -return subject == null ? getLoginUser() : new UserGroupInformation(subject); +if (subject == null || subject.getPrincipals(User.class).isEmpty()) { + return getLoginUser(); +} else { + return new UserGroupInformation(subject); +} } /** Modified: hadoop/common/branches/branch-1.2/src/test/org/apache/hadoop/security/TestUserGroupInformation.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/src/test/org/apache/hadoop/security/TestUserGroupInformation.java?rev=1455963&r1=1455962&r2=1455963&view=diff == --- hadoop/common/branches/branch-1.2/src/test/org/apache/hadoop/security/TestUserGroupInformation.java (original) +++ hadoop/common/branches/branch-1.2/src/test/org/apache/hadoop/security/TestUserGroupInformation.java Wed Mar 13 14:36:42 2013 @@ -16,12 +16,7 @@ */ package org.apache.hadoop.security; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - +import static org.junit.Assert.*; import static org.mockito.Mockito.mock; import java.io.BufferedReader; @@ -32,6 +27,7 @@ import java.util.Collection; import java.util.LinkedHashSet; import java.util.Set; +import javax.security.auth.Subject; import javax.security.auth.login.AppConfigurationEntry; import junit.framework.Assert; @@ -339,4 +335,22 @@ public class TestUserGroupInformation { assertGaugeGt("loginFailure_avg_time", 0, rb); } } + + /** + * Test for the case that UserGroupInformation.getCurrentUser() + * is called when the AccessControlContext has a Subject associated + * with it, but that Subject was not created by Hadoop (ie it has no + * associated User principal) + */ + @Test + public void testUGIUnderNonHadoopContext() throws Exception { +Subject nonHadoopSubject = new Subject(); +Subject.doAs(nonHadoopSubject, new PrivilegedExceptionAction() { +public Void run() throws IOException { + UserGroupInformation ugi = UserGroupInformation.getCurrentUser(); + assertNotNull(ugi); + return null; +} + }); + } }
svn commit: r1455953 - in /hadoop/common/branches/branch-1: CHANGES.txt src/core/org/apache/hadoop/security/UserGroupInformation.java src/test/org/apache/hadoop/security/TestUserGroupInformation.java
Author: suresh Date: Wed Mar 13 14:24:47 2013 New Revision: 1455953 URL: http://svn.apache.org/r1455953 Log: HADOOP-7101. UserGroupInformation.getCurrentUser() fails when called from non-Hadoop JAAS context. Backported by Suresh Srinivas. Modified: hadoop/common/branches/branch-1/CHANGES.txt hadoop/common/branches/branch-1/src/core/org/apache/hadoop/security/UserGroupInformation.java hadoop/common/branches/branch-1/src/test/org/apache/hadoop/security/TestUserGroupInformation.java Modified: hadoop/common/branches/branch-1/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1455953&r1=1455952&r2=1455953&view=diff == --- hadoop/common/branches/branch-1/CHANGES.txt (original) +++ hadoop/common/branches/branch-1/CHANGES.txt Wed Mar 13 14:24:47 2013 @@ -536,6 +536,9 @@ Release 1.2.0 - unreleased HADOOP-9379. capture the ulimit info after printing the log to the console. (Arpit Gupta via suresh) +HADOOP-7101. UserGroupInformation.getCurrentUser() fails when called from +non-Hadoop JAAS context. (todd, backported by suresh) + Release 1.1.2 - 2013.01.30 INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-1/src/core/org/apache/hadoop/security/UserGroupInformation.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/core/org/apache/hadoop/security/UserGroupInformation.java?rev=1455953&r1=1455952&r2=1455953&view=diff == --- hadoop/common/branches/branch-1/src/core/org/apache/hadoop/security/UserGroupInformation.java (original) +++ hadoop/common/branches/branch-1/src/core/org/apache/hadoop/security/UserGroupInformation.java Wed Mar 13 14:24:47 2013 @@ -465,7 +465,11 @@ public class UserGroupInformation { static UserGroupInformation getCurrentUser() throws IOException { AccessControlContext context = AccessController.getContext(); Subject subject = Subject.getSubject(context); -return subject == null ? getLoginUser() : new UserGroupInformation(subject); +if (subject == null || subject.getPrincipals(User.class).isEmpty()) { + return getLoginUser(); +} else { + return new UserGroupInformation(subject); +} } /** Modified: hadoop/common/branches/branch-1/src/test/org/apache/hadoop/security/TestUserGroupInformation.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/test/org/apache/hadoop/security/TestUserGroupInformation.java?rev=1455953&r1=1455952&r2=1455953&view=diff == --- hadoop/common/branches/branch-1/src/test/org/apache/hadoop/security/TestUserGroupInformation.java (original) +++ hadoop/common/branches/branch-1/src/test/org/apache/hadoop/security/TestUserGroupInformation.java Wed Mar 13 14:24:47 2013 @@ -16,12 +16,7 @@ */ package org.apache.hadoop.security; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - +import static org.junit.Assert.*; import static org.mockito.Mockito.mock; import java.io.BufferedReader; @@ -32,6 +27,7 @@ import java.util.Collection; import java.util.LinkedHashSet; import java.util.Set; +import javax.security.auth.Subject; import javax.security.auth.login.AppConfigurationEntry; import junit.framework.Assert; @@ -339,4 +335,22 @@ public class TestUserGroupInformation { assertGaugeGt("loginFailure_avg_time", 0, rb); } } + + /** + * Test for the case that UserGroupInformation.getCurrentUser() + * is called when the AccessControlContext has a Subject associated + * with it, but that Subject was not created by Hadoop (ie it has no + * associated User principal) + */ + @Test + public void testUGIUnderNonHadoopContext() throws Exception { +Subject nonHadoopSubject = new Subject(); +Subject.doAs(nonHadoopSubject, new PrivilegedExceptionAction() { +public Void run() throws IOException { + UserGroupInformation ugi = UserGroupInformation.getCurrentUser(); + assertNotNull(ugi); + return null; +} + }); + } }
svn commit: r1455950 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Author: suresh Date: Wed Mar 13 14:21:59 2013 New Revision: 1455950 URL: http://svn.apache.org/r1455950 Log: Move HADOP-7101 from 0.22 section to 0.23 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=1455950&r1=1455949&r2=1455950&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 Mar 13 14:21:59 2013 @@ -2346,6 +2346,9 @@ Release 0.23.0 - 2011-11-01 HADOOP-7797. Fix top-level pom.xml to refer to correct staging maven repository. (omalley via acmurthy) +HADOOP-7101. UserGroupInformation.getCurrentUser() fails when called from +non-Hadoop JAAS context. (todd) + Release 0.22.1 - Unreleased INCOMPATIBLE CHANGES @@ -2803,9 +2806,6 @@ Release 0.22.0 - 2011-11-29 HADOOP-7093. Servlets should default to text/plain (todd) -HADOOP-7101. UserGroupInformation.getCurrentUser() fails when called from -non-Hadoop JAAS context. (todd) - HADOOP-7089. Fix link resolution logic in hadoop-config.sh. (eli) HADOOP-7046. Fix Findbugs warning in Configuration. (Po Cheung via shv)
svn commit: r1455948 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
Author: suresh Date: Wed Mar 13 14:12:44 2013 New Revision: 1455948 URL: http://svn.apache.org/r1455948 Log: Move HADOP-7101 from 0.22 section to 0.23 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=1455948&r1=1455947&r2=1455948&view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Wed Mar 13 14:12:44 2013 @@ -2813,6 +2813,9 @@ Release 0.23.0 - 2011-11-01 HADOOP-7797. Fix top-level pom.xml to refer to correct staging maven repository. (omalley via acmurthy) +HADOOP-7101. UserGroupInformation.getCurrentUser() fails when called from +non-Hadoop JAAS context. (todd) + Release 0.22.1 - Unreleased INCOMPATIBLE CHANGES @@ -3270,9 +3273,6 @@ Release 0.22.0 - 2011-11-29 HADOOP-7093. Servlets should default to text/plain (todd) -HADOOP-7101. UserGroupInformation.getCurrentUser() fails when called from -non-Hadoop JAAS context. (todd) - HADOOP-7089. Fix link resolution logic in hadoop-config.sh. (eli) HADOOP-7046. Fix Findbugs warning in Configuration. (Po Cheung via shv)
svn commit: r1455884 - in /hadoop/common/branches/branch-1.2: ./ src/core/org/apache/hadoop/fs/ src/docs/src/documentation/content/xdocs/ src/hdfs/org/apache/hadoop/hdfs/ src/hdfs/org/apache/hadoop/hd
Author: szetszwo Date: Wed Mar 13 11:02:36 2013 New Revision: 1455884 URL: http://svn.apache.org/r1455884 Log: svn merge -c 1455883 from branch-1 for HDFS-4597. Backport WebHDFS concat. Added: hadoop/common/branches/branch-1.2/src/hdfs/org/apache/hadoop/hdfs/web/resources/ConcatSourcesParam.java - copied unchanged from r1455883, hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/web/resources/ConcatSourcesParam.java Modified: hadoop/common/branches/branch-1.2/ (props changed) hadoop/common/branches/branch-1.2/CHANGES.txt (contents, props changed) hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/fs/FileSystem.java hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/fs/FilterFileSystem.java hadoop/common/branches/branch-1.2/src/docs/src/documentation/content/xdocs/site.xml hadoop/common/branches/branch-1.2/src/docs/src/documentation/content/xdocs/webhdfs.xml hadoop/common/branches/branch-1.2/src/hdfs/org/apache/hadoop/hdfs/DistributedFileSystem.java hadoop/common/branches/branch-1.2/src/hdfs/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java hadoop/common/branches/branch-1.2/src/hdfs/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java hadoop/common/branches/branch-1.2/src/hdfs/org/apache/hadoop/hdfs/web/resources/PostOpParam.java hadoop/common/branches/branch-1.2/src/test/org/apache/hadoop/hdfs/web/TestFSMainOperationsWebHdfs.java Propchange: hadoop/common/branches/branch-1.2/ -- Merged /hadoop/common/branches/branch-1:r1455883 Modified: hadoop/common/branches/branch-1.2/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/CHANGES.txt?rev=1455884&r1=1455883&r2=1455884&view=diff == --- hadoop/common/branches/branch-1.2/CHANGES.txt (original) +++ hadoop/common/branches/branch-1.2/CHANGES.txt Wed Mar 13 11:02:36 2013 @@ -61,6 +61,8 @@ Release 1.2.0 - unreleased HDFS-4256 Backport concatenation of files into a single file to branch-1 (sanjay Radia) +HDFS-4597. Backport WebHDFS concat. (szetszwo) + IMPROVEMENTS HDFS-3515. Port HDFS-1457 to branch-1. (eli) Propchange: hadoop/common/branches/branch-1.2/CHANGES.txt -- Merged /hadoop/common/branches/branch-1/CHANGES.txt:r1455883 Modified: hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/fs/FileSystem.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/fs/FileSystem.java?rev=1455884&r1=1455883&r2=1455884&view=diff == --- hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/fs/FileSystem.java (original) +++ hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/fs/FileSystem.java Wed Mar 13 11:02:36 2013 @@ -669,6 +669,17 @@ public abstract class FileSystem extends */ public abstract FSDataOutputStream append(Path f, int bufferSize, Progressable progress) throws IOException; + + /** + * Concat existing files together. + * @param trg the path to the target destination. + * @param psrcs the paths to the sources to use for the concatenation. + * @throws IOException + */ + public void concat(final Path trg, final Path [] srcs) throws IOException { +throw new UnsupportedOperationException("Not implemented by the " + +getClass().getSimpleName() + " FileSystem implementation"); + } /** * Get replication. Modified: hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/fs/FilterFileSystem.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/fs/FilterFileSystem.java?rev=1455884&r1=1455883&r2=1455884&view=diff == --- hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/fs/FilterFileSystem.java (original) +++ hadoop/common/branches/branch-1.2/src/core/org/apache/hadoop/fs/FilterFileSystem.java Wed Mar 13 11:02:36 2013 @@ -114,7 +114,11 @@ public class FilterFileSystem extends Fi return fs.append(f, bufferSize, progress); } - /** {@inheritDoc} */ + @Override + public void concat(Path f, Path[] psrcs) throws IOException { +fs.concat(f, psrcs); + } + @Override public FSDataOutputStream create(Path f, FsPermission permission, boolean overwrite, int bufferSize, short replication, long blockSize, Modified: hadoop/common/branches/branch-1.2/src/docs/src/documentation/content/xdocs/site.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/src/docs/src/documentation/content/xdocs/site.xml?rev=1455884&r1=1455883&r2=1455884&view=diff =
svn commit: r1455883 - in /hadoop/common/branches/branch-1: ./ src/core/org/apache/hadoop/fs/ src/docs/src/documentation/content/xdocs/ src/hdfs/org/apache/hadoop/hdfs/ src/hdfs/org/apache/hadoop/hdfs
Author: szetszwo Date: Wed Mar 13 11:00:11 2013 New Revision: 1455883 URL: http://svn.apache.org/r1455883 Log: HDFS-4597. Backport WebHDFS concat. Added: hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/web/resources/ConcatSourcesParam.java Modified: hadoop/common/branches/branch-1/CHANGES.txt hadoop/common/branches/branch-1/src/core/org/apache/hadoop/fs/FileSystem.java hadoop/common/branches/branch-1/src/core/org/apache/hadoop/fs/FilterFileSystem.java hadoop/common/branches/branch-1/src/docs/src/documentation/content/xdocs/site.xml hadoop/common/branches/branch-1/src/docs/src/documentation/content/xdocs/webhdfs.xml hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/DistributedFileSystem.java hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/web/resources/PostOpParam.java hadoop/common/branches/branch-1/src/test/org/apache/hadoop/hdfs/web/TestFSMainOperationsWebHdfs.java Modified: hadoop/common/branches/branch-1/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1455883&r1=1455882&r2=1455883&view=diff == --- hadoop/common/branches/branch-1/CHANGES.txt (original) +++ hadoop/common/branches/branch-1/CHANGES.txt Wed Mar 13 11:00:11 2013 @@ -74,6 +74,8 @@ Release 1.2.0 - unreleased HDFS-4256 Backport concatenation of files into a single file to branch-1 (sanjay Radia) +HDFS-4597. Backport WebHDFS concat. (szetszwo) + IMPROVEMENTS HDFS-3515. Port HDFS-1457 to branch-1. (eli) Modified: hadoop/common/branches/branch-1/src/core/org/apache/hadoop/fs/FileSystem.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/core/org/apache/hadoop/fs/FileSystem.java?rev=1455883&r1=1455882&r2=1455883&view=diff == --- hadoop/common/branches/branch-1/src/core/org/apache/hadoop/fs/FileSystem.java (original) +++ hadoop/common/branches/branch-1/src/core/org/apache/hadoop/fs/FileSystem.java Wed Mar 13 11:00:11 2013 @@ -669,6 +669,17 @@ public abstract class FileSystem extends */ public abstract FSDataOutputStream append(Path f, int bufferSize, Progressable progress) throws IOException; + + /** + * Concat existing files together. + * @param trg the path to the target destination. + * @param psrcs the paths to the sources to use for the concatenation. + * @throws IOException + */ + public void concat(final Path trg, final Path [] srcs) throws IOException { +throw new UnsupportedOperationException("Not implemented by the " + +getClass().getSimpleName() + " FileSystem implementation"); + } /** * Get replication. Modified: hadoop/common/branches/branch-1/src/core/org/apache/hadoop/fs/FilterFileSystem.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/core/org/apache/hadoop/fs/FilterFileSystem.java?rev=1455883&r1=1455882&r2=1455883&view=diff == --- hadoop/common/branches/branch-1/src/core/org/apache/hadoop/fs/FilterFileSystem.java (original) +++ hadoop/common/branches/branch-1/src/core/org/apache/hadoop/fs/FilterFileSystem.java Wed Mar 13 11:00:11 2013 @@ -114,7 +114,11 @@ public class FilterFileSystem extends Fi return fs.append(f, bufferSize, progress); } - /** {@inheritDoc} */ + @Override + public void concat(Path f, Path[] psrcs) throws IOException { +fs.concat(f, psrcs); + } + @Override public FSDataOutputStream create(Path f, FsPermission permission, boolean overwrite, int bufferSize, short replication, long blockSize, Modified: hadoop/common/branches/branch-1/src/docs/src/documentation/content/xdocs/site.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/docs/src/documentation/content/xdocs/site.xml?rev=1455883&r1=1455882&r2=1455883&view=diff == --- hadoop/common/branches/branch-1/src/docs/src/documentation/content/xdocs/site.xml (original) +++ hadoop/common/branches/branch-1/src/docs/src/documentation/content/xdocs/site.xml Wed Mar 13 11:00:11 2013 @@ -166,6 +166,7 @@ See http://forrest.apache.org/docs/linki + Modified: hadoop/common/branches/branch-1/src/docs/src/documentation/content/xdocs/webhdfs.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/docs/src/documentation/content/xdocs/webhdfs.xml?rev=1455883&r1=1455882&r2=1455883&view=diff