Author: dhruba
Date: Tue Jun 2 06:04:59 2009
New Revision: 780942
URL: http://svn.apache.org/viewvc?rev=780942&view=rev
Log:
HADOOP-5891. SecondaryNamenode is able to converse with the NameNode
even when the default value of dfs.http.address is not overridden.
(Todd Lipcon via dhruba)
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
Modified: hadoop/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=780942&r1=780941&r2=780942&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Tue Jun 2 06:04:59 2009
@@ -743,6 +743,10 @@
HADOOP-5944. Add Apache license header to BlockManager.java. (Suresh
Srinivas via szetszwo)
+ HADOOP-5891. SecondaryNamenode is able to converse with the NameNode
+ even when the default value of dfs.http.address is not overridden.
+ (Todd Lipcon via dhruba)
+
Release 0.20.1 - Unreleased
INCOMPATIBLE CHANGES
Modified:
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java?rev=780942&r1=780941&r2=780942&view=diff
==============================================================================
---
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
(original)
+++
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
Tue Jun 2 06:04:59 2009
@@ -280,7 +280,13 @@
if (!FSConstants.HDFS_URI_SCHEME.equalsIgnoreCase(fsName.getScheme())) {
throw new IOException("This is not a DFS");
}
- return conf.get("dfs.http.address", "0.0.0.0:50070");
+ String configuredAddress = conf.get("dfs.http.address", "0.0.0.0:50070");
+ InetSocketAddress sockAddr = NetUtils.createSocketAddr(configuredAddress);
+ if (sockAddr.getAddress().isAnyLocalAddress()) {
+ return fsName.getHost() + ":" + sockAddr.getPort();
+ } else {
+ return configuredAddress;
+ }
}
/**
