Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-3932. NameNode Web UI broken if the rpc-address is set to the wildcard. Contributed by Colin Patrick McCabe 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1388323 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eli Collins 2012-09-21 04:56:34 +00:00
parent 7c886009aa
commit b3e947bc50
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
View File

@ -355,9 +355,8 @@ public class NetUtils {
} }
/** /**
* Returns the InetSocketAddress that a client can use to connect to the * Returns an InetSocketAddress that a client can use to connect to the
* given listening address. This returns "hostname:port" of the server, * given listening address.
* or "127.0.0.1:port" when given a wildcard address of "0.0.0.0:port".
* *
* @param addr of a listener * @param addr of a listener
* @return socket address that a client can use to connect to the server. * @return socket address that a client can use to connect to the server.

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -36,6 +36,9 @@ Release 2.0.3-alpha - Unreleased
HDFS-3949. NameNodeRpcServer#join should join on both client and HDFS-3949. NameNodeRpcServer#join should join on both client and
server RPC servers. (eli) server RPC servers. (eli)
HDFS-3932. NameNode Web UI broken if the rpc-address is set to the wildcard.
(Colin Patrick McCabe via eli)
Release 2.0.2-alpha - 2012-09-07 Release 2.0.2-alpha - 2012-09-07
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

3
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeHttpServer.java
View File

@ -140,7 +140,8 @@ public class NameNodeHttpServer {
.getPort()); .getPort());
} }
httpServer.setAttribute(NAMENODE_ATTRIBUTE_KEY, nn); httpServer.setAttribute(NAMENODE_ATTRIBUTE_KEY, nn);
httpServer.setAttribute(NAMENODE_ADDRESS_ATTRIBUTE_KEY, nn.getNameNodeAddress()); httpServer.setAttribute(NAMENODE_ADDRESS_ATTRIBUTE_KEY,
NetUtils.getConnectAddress(nn.getNameNodeAddress()));
httpServer.setAttribute(FSIMAGE_ATTRIBUTE_KEY, nn.getFSImage()); httpServer.setAttribute(FSIMAGE_ATTRIBUTE_KEY, nn.getFSImage());
httpServer.setAttribute(JspHelper.CURRENT_CONF, conf); httpServer.setAttribute(JspHelper.CURRENT_CONF, conf);
setupServlets(httpServer, conf); setupServlets(httpServer, conf);