Return-Path: X-Original-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B823DFC54 for ; Mon, 1 Apr 2013 16:48:33 +0000 (UTC) Received: (qmail 97653 invoked by uid 500); 1 Apr 2013 16:48:33 -0000 Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org Received: (qmail 96837 invoked by uid 500); 1 Apr 2013 16:48:26 -0000 Mailing-List: contact hdfs-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hdfs-dev@hadoop.apache.org Delivered-To: mailing list hdfs-commits@hadoop.apache.org Received: (qmail 96781 invoked by uid 99); 1 Apr 2013 16:48:23 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Apr 2013 16:48:23 +0000 X-ASF-Spam-Status: No, hits=-1998.0 required=5.0 tests=ALL_TRUSTED,FB_GET_MEDS X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Apr 2013 16:48:19 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7D88C2388B75; Mon, 1 Apr 2013 16:47:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1463203 - in /hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs: ./ src/main/java/org/apache/hadoop/lib/server/ src/test/java/org/apache/hadoop/fs/http/client/ src/test/java/org/apache/hadoop/lib/server/ src/test/java/... Date: Mon, 01 Apr 2013 16:47:34 -0000 To: hdfs-commits@hadoop.apache.org From: todd@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130401164734.7D88C2388B75@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: todd Date: Mon Apr 1 16:47:16 2013 New Revision: 1463203 URL: http://svn.apache.org/r1463203 Log: Complete commit of prior merge. The previous merge accidentally only committed the hdfs project instead of common and MR as well. Modified: hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/server/Server.java hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/client/BaseTestHttpFSWith.java hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/client/TestHttpFSFileSystemLocalFileSystem.java hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/server/TestServer.java hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/servlet/TestHostnameFilter.java hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestDirHelper.java hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHdfsHelper.java Modified: hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml?rev=1463203&r1=1463202&r2=1463203&view=diff ============================================================================== --- hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml (original) +++ hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml Mon Apr 1 16:47:16 2013 @@ -539,15 +539,8 @@ - - which cygpath 2> /dev/null - if [ $? = 1 ]; then - BUILD_DIR="${project.build.directory}" - else - BUILD_DIR=`cygpath --unix '${project.build.directory}'` - fi - cd $BUILD_DIR/tomcat.exp - tar xzf ${basedir}/downloads/apache-tomcat-${tomcat.version}.tar.gz + cd "${project.build.directory}/tomcat.exp" + gzip -cd ../../downloads/apache-tomcat-${tomcat.version}.tar.gz | tar xf - @@ -582,15 +575,8 @@ - - which cygpath 2> /dev/null - if [ $? = 1 ]; then - BUILD_DIR="${project.build.directory}" - else - BUILD_DIR=`cygpath --unix '${project.build.directory}'` - fi - cd $BUILD_DIR - tar czf ${project.artifactId}-${project.version}.tar.gz ${project.artifactId}-${project.version} + cd "${project.build.directory}" + tar cf - ${project.artifactId}-${project.version} | gzip > ${project.artifactId}-${project.version}.tar.gz Modified: hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/server/Server.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/server/Server.java?rev=1463203&r1=1463202&r2=1463203&view=diff ============================================================================== --- hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/server/Server.java (original) +++ hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/server/Server.java Mon Apr 1 16:47:16 2013 @@ -232,7 +232,7 @@ public class Server { * path. */ private String checkAbsolutePath(String value, String name) { - if (!value.startsWith("/")) { + if (!new File(value).isAbsolute()) { throw new IllegalArgumentException( MessageFormat.format("[{0}] must be an absolute path [{1}]", name, value)); } Modified: hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/client/BaseTestHttpFSWith.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/client/BaseTestHttpFSWith.java?rev=1463203&r1=1463202&r2=1463203&view=diff ============================================================================== --- hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/client/BaseTestHttpFSWith.java (original) +++ hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/client/BaseTestHttpFSWith.java Mon Apr 1 16:47:16 2013 @@ -364,7 +364,7 @@ public abstract class BaseTestHttpFSWith } } - private void testSetPermission() throws Exception { + protected void testSetPermission() throws Exception { FileSystem fs = FileSystem.get(getProxiedFSConf()); Path path = new Path(getProxiedFSTestDir(), "foodir"); fs.mkdirs(path); Modified: hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/client/TestHttpFSFileSystemLocalFileSystem.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/client/TestHttpFSFileSystemLocalFileSystem.java?rev=1463203&r1=1463202&r2=1463203&view=diff ============================================================================== --- hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/client/TestHttpFSFileSystemLocalFileSystem.java (original) +++ hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/client/TestHttpFSFileSystemLocalFileSystem.java Mon Apr 1 16:47:16 2013 @@ -20,8 +20,13 @@ package org.apache.hadoop.fs.http.client import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; +import org.apache.hadoop.fs.FileStatus; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.permission.FsAction; +import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.fs.Path; import org.apache.hadoop.test.TestDirHelper; +import org.junit.Assert; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -65,21 +70,31 @@ public class TestHttpFSFileSystemLocalFi } protected Path addPrefix(Path path) { - URI uri = path.toUri(); - try { - if (uri.getAuthority() != null) { - uri = new URI(uri.getScheme(), - uri.getAuthority(), PATH_PREFIX + uri.getPath()); - } - else { - if (uri.getPath().startsWith("/")) { - uri = new URI(PATH_PREFIX + uri.getPath()); - } - } - } catch (URISyntaxException ex) { - throw new RuntimeException("It should not happen: " + ex.toString(), ex); - } - return new Path(uri); + return Path.mergePaths(new Path(PATH_PREFIX), path); } + @Override + protected void testSetPermission() throws Exception { + if (Path.WINDOWS) { + FileSystem fs = FileSystem.get(getProxiedFSConf()); + Path path = new Path(getProxiedFSTestDir(), "foodir"); + fs.mkdirs(path); + + fs = getHttpFSFileSystem(); + FsPermission permission1 = new FsPermission(FsAction.READ_WRITE, FsAction.NONE, FsAction.NONE); + fs.setPermission(path, permission1); + fs.close(); + + fs = FileSystem.get(getProxiedFSConf()); + FileStatus status1 = fs.getFileStatus(path); + fs.close(); + FsPermission permission2 = status1.getPermission(); + Assert.assertEquals(permission2, permission1); + + // sticky bit not supported on Windows with local file system, so the + // subclass skips that part of the test + } else { + super.testSetPermission(); + } + } } Modified: hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/server/TestServer.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/server/TestServer.java?rev=1463203&r1=1463202&r2=1463203&view=diff ============================================================================== --- hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/server/TestServer.java (original) +++ hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/server/TestServer.java Mon Apr 1 16:47:16 2013 @@ -42,6 +42,7 @@ import org.apache.hadoop.test.HTestCase; import org.apache.hadoop.test.TestDir; import org.apache.hadoop.test.TestDirHelper; import org.apache.hadoop.test.TestException; +import org.apache.hadoop.util.Shell; import org.apache.hadoop.util.StringUtils; import org.junit.Test; @@ -50,21 +51,24 @@ public class TestServer extends HTestCas @Test @TestDir public void constructorsGetters() throws Exception { - Server server = new Server("server", "/a", "/b", "/c", "/d", new Configuration(false)); - assertEquals(server.getHomeDir(), "/a"); - assertEquals(server.getConfigDir(), "/b"); - assertEquals(server.getLogDir(), "/c"); - assertEquals(server.getTempDir(), "/d"); + Server server = new Server("server", getAbsolutePath("/a"), + getAbsolutePath("/b"), getAbsolutePath("/c"), getAbsolutePath("/d"), + new Configuration(false)); + assertEquals(server.getHomeDir(), getAbsolutePath("/a")); + assertEquals(server.getConfigDir(), getAbsolutePath("/b")); + assertEquals(server.getLogDir(), getAbsolutePath("/c")); + assertEquals(server.getTempDir(), getAbsolutePath("/d")); assertEquals(server.getName(), "server"); assertEquals(server.getPrefix(), "server"); assertEquals(server.getPrefixedName("name"), "server.name"); assertNotNull(server.getConfig()); - server = new Server("server", "/a", "/b", "/c", "/d"); - assertEquals(server.getHomeDir(), "/a"); - assertEquals(server.getConfigDir(), "/b"); - assertEquals(server.getLogDir(), "/c"); - assertEquals(server.getTempDir(), "/d"); + server = new Server("server", getAbsolutePath("/a"), getAbsolutePath("/b"), + getAbsolutePath("/c"), getAbsolutePath("/d")); + assertEquals(server.getHomeDir(), getAbsolutePath("/a")); + assertEquals(server.getConfigDir(), getAbsolutePath("/b")); + assertEquals(server.getLogDir(), getAbsolutePath("/c")); + assertEquals(server.getTempDir(), getAbsolutePath("/d")); assertEquals(server.getName(), "server"); assertEquals(server.getPrefix(), "server"); assertEquals(server.getPrefixedName("name"), "server.name"); @@ -793,4 +797,14 @@ public class TestServer extends HTestCas server.destroy(); } + /** + * Creates an absolute path by appending the given relative path to the test + * root. + * + * @param relativePath String relative path + * @return String absolute path formed by appending relative path to test root + */ + private static String getAbsolutePath(String relativePath) { + return new File(TestDirHelper.getTestDir(), relativePath).getAbsolutePath(); + } } Modified: hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/servlet/TestHostnameFilter.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/servlet/TestHostnameFilter.java?rev=1463203&r1=1463202&r2=1463203&view=diff ============================================================================== --- hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/servlet/TestHostnameFilter.java (original) +++ hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/servlet/TestHostnameFilter.java Mon Apr 1 16:47:16 2013 @@ -50,7 +50,10 @@ public class TestHostnameFilter extends @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) throws IOException, ServletException { - assertTrue(HostnameFilter.get().contains("localhost")); + // Hostname was set to "localhost", but may get resolved automatically to + // "127.0.0.1" depending on OS. + assertTrue(HostnameFilter.get().contains("localhost") || + HostnameFilter.get().contains("127.0.0.1")); invoked.set(true); } }; Modified: hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestDirHelper.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestDirHelper.java?rev=1463203&r1=1463202&r2=1463203&view=diff ============================================================================== --- hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestDirHelper.java (original) +++ hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestDirHelper.java Mon Apr 1 16:47:16 2013 @@ -63,7 +63,7 @@ public class TestDirHelper implements Me static { try { TEST_DIR_ROOT = System.getProperty(TEST_DIR_PROP, new File("target").getAbsolutePath()); - if (!TEST_DIR_ROOT.startsWith("/")) { + if (!new File(TEST_DIR_ROOT).isAbsolute()) { System.err.println(MessageFormat.format("System property [{0}]=[{1}] must be set to an absolute path", TEST_DIR_PROP, TEST_DIR_ROOT)); System.exit(-1); Modified: hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHdfsHelper.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHdfsHelper.java?rev=1463203&r1=1463202&r2=1463203&view=diff ============================================================================== --- hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHdfsHelper.java (original) +++ hadoop/common/branches/HDFS-347/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/test/TestHdfsHelper.java Mon Apr 1 16:47:16 2013 @@ -82,7 +82,8 @@ public class TestHdfsHelper extends Test private Path resetHdfsTestDir(Configuration conf) { - Path testDir = new Path("./" + TEST_DIR_ROOT, testName + "-" + counter.getAndIncrement()); + Path testDir = new Path("/tmp/" + testName + "-" + + counter.getAndIncrement()); try { // currentUser FileSystem fs = FileSystem.get(conf);