Author: cutting
Date: Thu May 3 12:42:20 2007
New Revision: 534973
URL: http://svn.apache.org/viewvc?view=rev&rev=534973
Log:
Fix TaskTracker blacklisting to work correctly in one- and two-node clusters.
Contributed by Arun.
Modified:
lucene/hadoop/trunk/CHANGES.txt
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobInProgress.java
Modified: lucene/hadoop/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=534973&r1=534972&r2=534973
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Thu May 3 12:42:20 2007
@@ -322,6 +322,9 @@
95. HADOOP-485. Allow a different comparator for grouping keys in
calls to reduce. (Tahir Hashmi via cutting)
+96. HADOOP-1322. Fix TaskTracker blacklisting to work correctly in
+ one- and two-node clusters. (Arun C Murthy via cutting)
+
Release 0.12.3 - 2007-04-06
Modified:
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobInProgress.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobInProgress.java?view=diff&rev=534973&r1=534972&r2=534973
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobInProgress.java
(original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobInProgress.java
Thu May 3 12:42:20 2007
@@ -594,7 +594,8 @@
// tasktracker prior to assigning it a new one.
//
int taskTrackerFailedTasks = getTrackerTaskFailures(taskTracker);
- if (taskTrackerFailedTasks >= conf.getMaxTaskFailuresPerTracker()) {
+ if ((flakyTaskTrackers < (clusterSize * CLUSTER_BLACKLIST_PERCENT)) &&
+ taskTrackerFailedTasks >= conf.getMaxTaskFailuresPerTracker()) {
if (LOG.isDebugEnabled()) {
String flakyTracker = convertTrackerNameToHostName(taskTracker);
LOG.debug("Ignoring the black-listed tasktracker: '" + flakyTracker
