Преглед на файлове

Merge -r 540468:540469 from trunk to 0.13 branch. Fixes: HADOOP-1407.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/branches/branch-0.13@540473 13f79535-47bb-0310-9956-ffa450edef68
Thomas White преди 18 години
родител
ревизия
cb238d625b
променени са 2 файла, в които са добавени 6 реда и са изтрити 2 реда
  1. 4 0
      CHANGES.txt
  2. 2 2
      src/java/org/apache/hadoop/mapred/JobInProgress.java

+ 4 - 0
CHANGES.txt

@@ -415,6 +415,10 @@ Branch 0.13 (unreleased changes)
      force applications to use "." to name the default directory.
      force applications to use "." to name the default directory.
      (Hairong Kuang via cutting)
      (Hairong Kuang via cutting)
 
 
+125. HADOOP-1407.  Fix integer division bug in JobInProgress which
+     meant failed tasks didn't cause the job to fail.
+     (Arun C Murthy via tomwhite)
+
 
 
 Release 0.12.3 - 2007-04-06
 Release 0.12.3 - 2007-04-06
 
 

+ 2 - 2
src/java/org/apache/hadoop/mapred/JobInProgress.java

@@ -945,8 +945,8 @@ class JobInProgress {
       //
       //
       boolean killJob = 
       boolean killJob = 
         tip.isMapTask() ? 
         tip.isMapTask() ? 
-            (((++failedMapTIPs*100)/numMapTasks) > mapFailuresPercent) :
-            (((++failedReduceTIPs*100)/numReduceTasks) > reduceFailuresPercent);
+            ((++failedMapTIPs*100) > (mapFailuresPercent*numMapTasks)) :
+            ((++failedReduceTIPs*100) > (reduceFailuresPercent*numReduceTasks));
       
       
       if (killJob) {
       if (killJob) {
         LOG.info("Aborting job " + profile.getJobId());
         LOG.info("Aborting job " + profile.getJobId());