Author: tucu
Date: Tue Sep 18 05:45:57 2012
New Revision: 1386994
URL: http://svn.apache.org/viewvc?rev=1386994&view=rev
Log:
HDFS-3944. Httpfs resolveAuthority() is not resolving host correctly. (tucu)
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/ServerWebApp.java
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/servlet/TestServerWebApp.java
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/ServerWebApp.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/ServerWebApp.java?rev=1386994&r1=1386993&r2=1386994&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/ServerWebApp.java
(original)
+++
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/servlet/ServerWebApp.java
Tue Sep 18 05:45:57 2012
@@ -181,7 +181,7 @@ public abstract class ServerWebApp exten
throw new ServerException(ServerException.ERROR.S13, portKey);
}
try {
- InetAddress add = InetAddress.getByName(hostnameKey);
+ InetAddress add = InetAddress.getByName(host);
int portNum = Integer.parseInt(port);
return new InetSocketAddress(add, portNum);
} catch (UnknownHostException ex) {
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/servlet/TestServerWebApp.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/servlet/TestServerWebApp.java?rev=1386994&r1=1386993&r2=1386994&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/servlet/TestServerWebApp.java
(original)
+++
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/servlet/TestServerWebApp.java
Tue Sep 18 05:45:57 2012
@@ -24,8 +24,11 @@ import org.apache.hadoop.lib.server.Serv
import org.apache.hadoop.test.HTestCase;
import org.apache.hadoop.test.TestDir;
import org.apache.hadoop.test.TestDirHelper;
+import org.junit.Assert;
import org.junit.Test;
+import java.net.InetSocketAddress;
+
public class TestServerWebApp extends HTestCase {
@Test(expected = IllegalArgumentException.class)
@@ -74,4 +77,23 @@ public class TestServerWebApp extends HT
server.contextInitialized(null);
}
+
+ @Test
+ @TestDir
+ public void testResolveAuthority() throws Exception {
+ String dir = TestDirHelper.getTestDir().getAbsolutePath();
+ System.setProperty("TestServerWebApp3.home.dir", dir);
+ System.setProperty("TestServerWebApp3.config.dir", dir);
+ System.setProperty("TestServerWebApp3.log.dir", dir);
+ System.setProperty("TestServerWebApp3.temp.dir", dir);
+ System.setProperty("testserverwebapp3.http.hostname", "localhost");
+ System.setProperty("testserverwebapp3.http.port", "14000");
+ ServerWebApp server = new ServerWebApp("TestServerWebApp3") {
+ };
+
+ InetSocketAddress address = server.resolveAuthority();
+ Assert.assertEquals("localhost", address.getHostName());
+ Assert.assertEquals(14000, address.getPort());
+ }
+
}
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1386994&r1=1386993&r2=1386994&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Tue Sep 18
05:45:57 2012
@@ -773,6 +773,8 @@ Release 2.0.2-alpha - 2012-09-07
HDFS-3928. MiniDFSCluster should reset the first ExitException on
shutdown. (eli)
HDFS-3938. remove current limitations from HttpFS docs. (tucu)
+
+ HDFS-3944. Httpfs resolveAuthority() is not resolving host correctly.
(tucu)
BREAKDOWN OF HDFS-3042 SUBTASKS
