You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cd...@apache.org on 2009/03/31 22:53:38 UTC
svn commit: r760610 - in /hadoop/core/trunk: ./
src/core/org/apache/hadoop/net/
src/hdfs/org/apache/hadoop/hdfs/server/datanode/
src/hdfs/org/apache/hadoop/hdfs/server/namenode/
src/hdfs/org/apache/hadoop/hdfs/tools/ src/mapred/org/apache/hadoop/mapred/
Author: cdouglas
Date: Tue Mar 31 20:53:37 2009
New Revision: 760610
URL: http://svn.apache.org/viewvc?rev=760610&view=rev
Log:
HADOOP-2827. Remove deprecated NetUtils::getServerAddress.
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/core/org/apache/hadoop/net/NetUtils.java
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/tools/DFSck.java
hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/JobTracker.java
hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=760610&r1=760609&r2=760610&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Tue Mar 31 20:53:37 2009
@@ -29,6 +29,8 @@
HADOOP-5486. Removes the CLASSPATH string from the command line and instead
exports it in the environment. (Amareshwari Sriramadasu via ddas)
+ HADOOP-2827. Remove deprecated NetUtils::getServerAddress. (cdouglas)
+
NEW FEATURES
HADOOP-4268. Change fsck to use ClientProtocol methods so that the
Modified: hadoop/core/trunk/src/core/org/apache/hadoop/net/NetUtils.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/core/org/apache/hadoop/net/NetUtils.java?rev=760610&r1=760609&r2=760610&view=diff
==============================================================================
--- hadoop/core/trunk/src/core/org/apache/hadoop/net/NetUtils.java (original)
+++ hadoop/core/trunk/src/core/org/apache/hadoop/net/NetUtils.java Tue Mar 31 20:53:37 2009
@@ -164,46 +164,6 @@
}
/**
- * Handle the transition from pairs of attributes specifying a host and port
- * to a single colon separated one.
- * @param conf the configuration to check
- * @param oldBindAddressName the old address attribute name
- * @param oldPortName the old port attribute name
- * @param newBindAddressName the new combined name
- * @return the complete address from the configuration
- */
- @Deprecated
- public static String getServerAddress(Configuration conf,
- String oldBindAddressName,
- String oldPortName,
- String newBindAddressName) {
- String oldAddr = conf.get(oldBindAddressName);
- String oldPort = conf.get(oldPortName);
- String newAddrPort = conf.get(newBindAddressName);
- if (oldAddr == null && oldPort == null) {
- return newAddrPort;
- }
- String[] newAddrPortParts = newAddrPort.split(":",2);
- if (newAddrPortParts.length != 2) {
- throw new IllegalArgumentException("Invalid address/port: " +
- newAddrPort);
- }
- if (oldAddr == null) {
- oldAddr = newAddrPortParts[0];
- } else {
- LOG.warn("Configuration parameter " + oldBindAddressName +
- " is deprecated. Use " + newBindAddressName + " instead.");
- }
- if (oldPort == null) {
- oldPort = newAddrPortParts[1];
- } else {
- LOG.warn("Configuration parameter " + oldPortName +
- " is deprecated. Use " + newBindAddressName + " instead.");
- }
- return oldAddr + ":" + oldPort;
- }
-
- /**
* Adds a static resolution for host. This can be used for setting up
* hostnames with names that are fake to point to a well known host. For e.g.
* in some testcases we require to have daemons with different hostnames
Modified: hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java?rev=760610&r1=760609&r2=760610&view=diff
==============================================================================
--- hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java (original)
+++ hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java Tue Mar 31 20:53:37 2009
@@ -255,12 +255,8 @@
this.transferToAllowed = conf.getBoolean("dfs.datanode.transferTo.allowed",
true);
this.writePacketSize = conf.getInt("dfs.write.packet.size", 64*1024);
- String address =
- NetUtils.getServerAddress(conf,
- "dfs.datanode.bindAddress",
- "dfs.datanode.port",
- "dfs.datanode.address");
- InetSocketAddress socAddr = NetUtils.createSocketAddr(address);
+ InetSocketAddress socAddr = NetUtils.createSocketAddr(
+ conf.get("dfs.datanode.address", "0.0.0.0:50010"));
int tmpPort = socAddr.getPort();
storage = new DataStorage();
// construct registration
@@ -348,12 +344,8 @@
}
//create a servlet to serve full-file content
- String infoAddr =
- NetUtils.getServerAddress(conf,
- "dfs.datanode.info.bindAddress",
- "dfs.datanode.info.port",
- "dfs.datanode.http.address");
- InetSocketAddress infoSocAddr = NetUtils.createSocketAddr(infoAddr);
+ InetSocketAddress infoSocAddr = NetUtils.createSocketAddr(
+ conf.get("dfs.datanode.http.address", "0.0.0.0:50075"));
String infoHost = infoSocAddr.getHostName();
int tmpInfoPort = infoSocAddr.getPort();
this.infoServer = new HttpServer("datanode", infoHost, tmpInfoPort,
Modified: hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java?rev=760610&r1=760609&r2=760610&view=diff
==============================================================================
--- hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java (original)
+++ hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java Tue Mar 31 20:53:37 2009
@@ -205,9 +205,8 @@
}
protected InetSocketAddress getHttpServerAddress(Configuration conf) {
- String addr = NetUtils.getServerAddress(conf, "dfs.info.bindAddress",
- "dfs.info.port", "dfs.http.address");
- return NetUtils.createSocketAddr(addr);
+ return NetUtils.createSocketAddr(
+ conf.get("dfs.http.address", "0.0.0.0:50070"));
}
protected void setHttpServerAddress(Configuration conf){
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=760610&r1=760609&r2=760610&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 Mar 31 20:53:37 2009
@@ -167,12 +167,8 @@
checkpointSize = conf.getLong("fs.checkpoint.size", 4194304);
// initialize the webserver for uploading files.
- String infoAddr =
- NetUtils.getServerAddress(conf,
- "dfs.secondary.info.bindAddress",
- "dfs.secondary.info.port",
- "dfs.secondary.http.address");
- InetSocketAddress infoSocAddr = NetUtils.createSocketAddr(infoAddr);
+ InetSocketAddress infoSocAddr = NetUtils.createSocketAddr(
+ conf.get("dfs.secondary.http.address", "0.0.0.0:50090"));
infoBindAddress = infoSocAddr.getHostName();
int tmpInfoPort = infoSocAddr.getPort();
infoServer = new HttpServer("secondary", infoBindAddress, tmpInfoPort,
@@ -306,8 +302,7 @@
if (!"hdfs".equals(fsName.getScheme())) {
throw new IOException("This is not a DFS");
}
- return NetUtils.getServerAddress(conf, "dfs.info.bindAddress",
- "dfs.info.port", "dfs.http.address");
+ return conf.get("dfs.http.address", "0.0.0.0:50070");
}
/**
Modified: hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/tools/DFSck.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/tools/DFSck.java?rev=760610&r1=760609&r2=760610&view=diff
==============================================================================
--- hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/tools/DFSck.java (original)
+++ hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/tools/DFSck.java Tue Mar 31 20:53:37 2009
@@ -77,12 +77,7 @@
super(conf);
this.ugi = UnixUserGroupInformation.login(conf, true);
}
-
- private String getInfoServer() throws IOException {
- return NetUtils.getServerAddress(getConf(), "dfs.info.bindAddress",
- "dfs.info.port", "dfs.http.address");
- }
-
+
/**
* Print fsck usage information
*/
@@ -112,7 +107,8 @@
}
final StringBuffer url = new StringBuffer("http://");
- url.append(getInfoServer()).append("/fsck?ugi=").append(ugi).append("&path=");
+ url.append(getConf().get("dfs.http.address", "0.0.0.0:50070"));
+ url.append("/fsck?ugi=").append(ugi).append("&path=");
String dir = "/";
// find top-level dir first
Modified: hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/JobTracker.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/JobTracker.java?rev=760610&r1=760609&r2=760610&view=diff
==============================================================================
--- hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/JobTracker.java (original)
+++ hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/JobTracker.java Tue Mar 31 20:53:37 2009
@@ -1430,11 +1430,8 @@
}
}
- String infoAddr =
- NetUtils.getServerAddress(conf, "mapred.job.tracker.info.bindAddress",
- "mapred.job.tracker.info.port",
- "mapred.job.tracker.http.address");
- InetSocketAddress infoSocAddr = NetUtils.createSocketAddr(infoAddr);
+ InetSocketAddress infoSocAddr = NetUtils.createSocketAddr(
+ conf.get("mapred.job.tracker.http.address", "0.0.0.0:50030"));
String infoBindAddress = infoSocAddr.getHostName();
int tmpInfoPort = infoSocAddr.getPort();
this.startTime = System.currentTimeMillis();
Modified: hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/TaskTracker.java?rev=760610&r1=760609&r2=760610&view=diff
==============================================================================
--- hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/TaskTracker.java (original)
+++ hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/TaskTracker.java Tue Mar 31 20:53:37 2009
@@ -528,12 +528,8 @@
}
// bind address
- String address =
- NetUtils.getServerAddress(fConf,
- "mapred.task.tracker.report.bindAddress",
- "mapred.task.tracker.report.port",
- "mapred.task.tracker.report.address");
- InetSocketAddress socAddr = NetUtils.createSocketAddr(address);
+ InetSocketAddress socAddr = NetUtils.createSocketAddr(
+ fConf.get("mapred.task.tracker.report.address", "127.0.0.1:0"));
String bindAddress = socAddr.getHostName();
int tmpPort = socAddr.getPort();
@@ -962,12 +958,8 @@
maxCurrentReduceTasks = conf.getInt(
"mapred.tasktracker.reduce.tasks.maximum", 2);
this.jobTrackAddr = JobTracker.getAddress(conf);
- String infoAddr =
- NetUtils.getServerAddress(conf,
- "tasktracker.http.bindAddress",
- "tasktracker.http.port",
- "mapred.task.tracker.http.address");
- InetSocketAddress infoSocAddr = NetUtils.createSocketAddr(infoAddr);
+ InetSocketAddress infoSocAddr = NetUtils.createSocketAddr(
+ conf.get("mapred.task.tracker.http.address", "0.0.0.0:50060"));
String httpBindAddress = infoSocAddr.getHostName();
int httpPort = infoSocAddr.getPort();
this.server = new HttpServer("task", httpBindAddress, httpPort,