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

[cutting]

Author: cutting
Date: Wed Aug 29 14:36:51 2007
New Revision: 570940

URL: http://svn.apache.org/viewvc?rev=570940&view=rev
Log:
Merge -r 570936:570937 from trunk to 0.14 branch.  Fixes: HADOOP-1798.

Modified:
    lucene/hadoop/branches/branch-0.14/CHANGES.txt
    
lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/mapred/JobTracker.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=570940&r1=570939&r2=570940&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.14/CHANGES.txt (original)
+++ lucene/hadoop/branches/branch-0.14/CHANGES.txt Wed Aug 29 14:36:51 2007
@@ -11,6 +11,9 @@
     HADOOP-1790.  Fix tasktracker to work correctly on multi-homed
     boxes.  (Torsten Curdt via cutting)
 
+    HADOOP-1798.  Fix jobtracker to correctly account for failed
+    tasks.  (omalley via cutting)
+
 
 Release 0.14.0 - 2007-08-17
 

Modified: 
lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/mapred/JobTracker.java
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/mapred/JobTracker.java?rev=570940&r1=570939&r2=570940&view=diff
==============================================================================
--- 
lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/mapred/JobTracker.java
 (original)
+++ 
lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/mapred/JobTracker.java
 Wed Aug 29 14:36:51 2007
@@ -1225,7 +1225,7 @@
           // If not first contact, there should be some record of the tracker
           if (!seenBefore) {
             LOG.warn("Status from unknown Tracker : " + trackerName);
-            taskTrackers.remove(trackerName); 
+            updateTaskTrackerStatus(trackerName, null);
             return false;
           }
         }