Author: cutting
Date: Thu Aug 30 11:48:48 2007
New Revision: 571275
URL: http://svn.apache.org/viewvc?rev=571275&view=rev
Log:
HADOOP-1739. Let OS always choose the tasktracker's umbilical port.
Modified:
lucene/hadoop/trunk/CHANGES.txt
lucene/hadoop/trunk/conf/hadoop-default.xml
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskRunner.java
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskTracker.java
Modified: lucene/hadoop/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?rev=571275&r1=571274&r2=571275&view=diff
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Thu Aug 30 11:48:48 2007
@@ -135,6 +135,10 @@
HADOOP-1803. Generalize build.xml to make files in all
src/contrib/*/bin directories executable. (stack via cutting)
+ HADOOP-1739. Let OS always choose the tasktracker's umbilical
+ port. Also switch default address for umbilical connections to
+ loopback. (cutting)
+
Release 0.14.1 - (unreleased)
BUG FIXES
Modified: lucene/hadoop/trunk/conf/hadoop-default.xml
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/conf/hadoop-default.xml?rev=571275&r1=571274&r2=571275&view=diff
==============================================================================
--- lucene/hadoop/trunk/conf/hadoop-default.xml (original)
+++ lucene/hadoop/trunk/conf/hadoop-default.xml Thu Aug 30 11:48:48 2007
@@ -468,18 +468,9 @@
<property>
<name>mapred.task.tracker.report.bindAddress</name>
- <value>0.0.0.0</value>
- <description>
- the address where the maperd tracker report server will be binded on.
- </description>
-</property>
-
-<property>
- <name>mapred.task.tracker.report.port</name>
- <value>50050</value>
- <description>The port number that the MapReduce task tracker report server
uses as a starting
- point to look for a free port to listen on.
- </description>
+ <value>127.0.0.1</value>
+ <description>The interface that task processes use to communicate
+ with their parent tasktracker process.</description>
</property>
<property>
@@ -617,14 +608,11 @@
<description>Java opts for the task tracker child processes. Subsumes
'mapred.child.heap.size' (If a mapred.child.heap.size value is found
in a configuration, its maximum heap size will be used and a warning
- emitted that heap.size has been deprecated). Also, the following symbols,
- if present, will be interpolated: @taskid@ is replaced by current TaskID;
- and @port@ will be replaced by mapred.task.tracker.report.port + 1 (A second
- child will fail with a port-in-use if mapred.tasktracker.tasks.maximum is
- greater than one). Any other occurrences of '@' will go unchanged. For
+ emitted that heap.size has been deprecated). Also, the following symbol,
+ if present, will be interpolated: @taskid@ is replaced by current TaskID.
+ Any other occurrences of '@' will go unchanged. For
example, to enable verbose gc logging to a file named for the taskid in
/tmp and to set the heap maximum to be a gigabyte, pass a 'value' of:
-
-Xmx1024m -verbose:gc -Xloggc:/tmp/@[EMAIL PROTECTED]
</description>
</property>
Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskRunner.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskRunner.java?rev=571275&r1=571274&r2=571275&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskRunner.java
(original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskRunner.java Thu
Aug 30 11:48:48 2007
@@ -23,6 +23,7 @@
import org.apache.hadoop.filecache.*;
import org.apache.hadoop.util.*;
import java.io.*;
+import java.net.InetSocketAddress;
import java.util.List;
import java.util.Vector;
import java.net.URI;
@@ -224,7 +225,6 @@
// The following symbols if present in mapred.child.java.opts value are
// replaced:
// + @taskid@ is interpolated with value of TaskID.
- // + Replaces @port@ with mapred.task.tracker.report.port + 1.
// Other occurrences of @ will not be altered.
//
// Example with multiple arguments and substitutions, showing
@@ -236,15 +236,12 @@
// <value>-verbose:gc -Xloggc:/tmp/@[EMAIL PROTECTED] \
// -Dcom.sun.management.jmxremote.authenticate=false \
// -Dcom.sun.management.jmxremote.ssl=false \
- // [EMAIL PROTECTED]@
// </value>
//
String javaOpts = handleDeprecatedHeapSize(
conf.get("mapred.child.java.opts", "-Xmx200m"),
conf.get("mapred.child.heap.size"));
javaOpts = replaceAll(javaOpts, "@taskid@", taskid);
- int port = conf.getInt("mapred.task.tracker.report.port", 50050) + 1;
- javaOpts = replaceAll(javaOpts, "@port@", Integer.toString(port));
String [] javaOptsSplit = javaOpts.split(" ");
//Add java.library.path; necessary for native-hadoop libraries
String libraryPath = System.getProperty("java.library.path");
@@ -279,8 +276,10 @@
// Add main class and its arguments
vargs.add(TaskTracker.Child.class.getName()); // main of Child
- // pass umbilical port
- vargs.add(Integer.toString(tracker.getTaskTrackerReportPort()));
+ // pass umbilical address
+ InetSocketAddress address = tracker.getTaskTrackerReportAddress();
+ vargs.add(address.getAddress().getHostAddress());
+ vargs.add(Integer.toString(address.getPort()));
vargs.add(taskid); // pass task identifier
// Run java
Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskTracker.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskTracker.java?rev=571275&r1=571274&r2=571275&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskTracker.java
(original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskTracker.java Thu
Aug 30 11:48:48 2007
@@ -93,8 +93,7 @@
String localHostname;
InetSocketAddress jobTrackAddr;
- String taskReportBindAddress;
- private int taskReportPort;
+ InetSocketAddress taskReportAddress;
Server taskReportServer = null;
InterTrackerProtocol jobClient;
@@ -402,31 +401,22 @@
this.myMetrics = new TaskTrackerMetrics();
- // port numbers
- this.taskReportPort = this.fConf.getInt("mapred.task.tracker.report.port",
50050);
// bind address
- this.taskReportBindAddress =
this.fConf.get("mapred.task.tracker.report.bindAddress", "0.0.0.0");
+ String bindAddress =
+ this.fConf.get("mapred.task.tracker.report.bindAddress", "127.0.0.1");
// RPC initialization
- while (true) {
- try {
- this.taskReportServer = RPC.getServer(this,
this.taskReportBindAddress, this.taskReportPort, maxCurrentTasks, false,
this.fConf);
- this.taskReportServer.start();
- break;
- } catch (BindException e) {
- LOG.info("Could not open report server at " + this.taskReportPort + ",
trying new port");
- this.taskReportPort++;
- }
-
- }
- // The rpc-server port can be ephemeral...
- // ... ensure we have the correct info
- this.taskReportPort = taskReportServer.getListenerAddress().getPort();
- this.fConf.setInt("mapred.task.tracker.report.port", this.taskReportPort);
- LOG.info("TaskTracker up at: " + this.taskReportPort);
+ this.taskReportServer =
+ RPC.getServer(this, bindAddress, 0, maxCurrentTasks, false, this.fConf);
+ this.taskReportServer.start();
+
+ // get the assigned address
+ this.taskReportAddress = taskReportServer.getListenerAddress();
+ this.fConf.set("mapred.task.tracker.report.address",
+ taskReportAddress.toString());
+ LOG.info("TaskTracker up at: " + this.taskReportAddress);
- this.taskTrackerName = "tracker_" +
- localHostname + ":" + taskReportPort;
+ this.taskTrackerName = "tracker_" + localHostname + ":" +
taskReportAddress;
LOG.info("Starting tracker " + taskTrackerName);
// Clear out temporary files that might be lying around
@@ -777,8 +767,8 @@
}
/** Return the port at which the tasktracker bound to */
- public synchronized int getTaskTrackerReportPort() {
- return taskReportPort;
+ public synchronized InetSocketAddress getTaskTrackerReportAddress() {
+ return taskReportAddress;
}
/** Queries the job tracker for a set of outputs ready to be copied
@@ -1766,11 +1756,10 @@
LOG.debug("Child starting");
JobConf defaultConf = new JobConf();
- int port = Integer.parseInt(args[0]);
- InetSocketAddress address = new InetSocketAddress
- (defaultConf.get("mapred.task.tracker.report.bindAddress","0.0.0.0"),
- port);
- String taskid = args[1];
+ String host = args[0];
+ int port = Integer.parseInt(args[1]);
+ InetSocketAddress address = new InetSocketAddress(host, port);
+ String taskid = args[2];
//set a very high idle timeout so that the connection is never closed
defaultConf.setInt("ipc.client.connection.maxidletime", 60*60*1000);
TaskUmbilicalProtocol umbilical =
