svn commit: r570560 - in /lucene/hadoop/branches/branch-0.14: CHANGES.txt src/java/org/apache/hadoop/mapred/TaskTracker.java

[cutting]

Author: cutting
Date: Tue Aug 28 13:15:57 2007
New Revision: 570560

URL: http://svn.apache.org/viewvc?rev=570560&view=rev
Log:
Merge -r 570558:570559 from trunk to 0.14 branch.  Fixes: HADOOP-1790.

Modified:
    lucene/hadoop/branches/branch-0.14/CHANGES.txt
    
lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/mapred/TaskTracker.java

Modified: lucene/hadoop/branches/branch-0.14/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.14/CHANGES.txt?rev=570560&r1=570559&r2=570560&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.14/CHANGES.txt (original)
+++ lucene/hadoop/branches/branch-0.14/CHANGES.txt Tue Aug 28 13:15:57 2007
@@ -8,6 +8,9 @@
     HADOOP-1740.  Fix null pointer exception in sorting map outputs. (Devaraj
     Das via omalley)
 
+    HADOOP-1790.  Fix tasktracker to work correctly on multi-homed
+    boxes.  (Torsten Curdt via cutting)
+
 
 Release 0.14.0 - 2007-08-17
 

Modified: 
lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/mapred/TaskTracker.java
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/mapred/TaskTracker.java?rev=570560&r1=570559&r2=570560&view=diff
==============================================================================
--- 
lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/mapred/TaskTracker.java
 (original)
+++ 
lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/mapred/TaskTracker.java
 Tue Aug 28 13:15:57 2007
@@ -17,13 +17,9 @@
  */
  package org.apache.hadoop.mapred;
 
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FilterOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.net.BindException;
@@ -1755,11 +1751,14 @@
 
       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];
       TaskUmbilicalProtocol umbilical =
         (TaskUmbilicalProtocol)RPC.getProxy(TaskUmbilicalProtocol.class,
                                             TaskUmbilicalProtocol.versionID,
-                                            new InetSocketAddress(port), 
+                                            address,
                                             defaultConf);
             
       Task task = umbilical.getTask(taskid);