瀏覽代碼

MAPREDUCE-2324. Removed usage of broken ResourceEstimator.getEstimatedReduceInputSize to check against usable disk-space on TaskTracker. Contributed by Robert Evans.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security@1152960 13f79535-47bb-0310-9956-ffa450edef68
Arun Murthy 14 年之前
父節點
當前提交
c8bb3e2c7d
共有 2 個文件被更改,包括 4 次插入10 次删除
  1. 4 0
      CHANGES.txt
  2. 0 10
      src/mapred/org/apache/hadoop/mapred/JobInProgress.java

+ 4 - 0
CHANGES.txt

@@ -51,6 +51,10 @@ Release 0.20.204.0 - unreleased
 
   BUG FIXES
 
+    MAPREDUCE-2324. Removed usage of broken
+    ResourceEstimator.getEstimatedReduceInputSize to check against usable
+    disk-space on TaskTracker. (Robert Evans via acmurthy) 
+
     MAPREDUCE-2621. TestCapacityScheduler fails with "Queue "q1" does not exist".
     (Sherry Chen via mahadev)
 

+ 0 - 10
src/mapred/org/apache/hadoop/mapred/JobInProgress.java

@@ -2438,16 +2438,6 @@ public class JobInProgress {
       return -1;
     }
 
-    long outSize = resourceEstimator.getEstimatedReduceInputSize();
-    long availSpace = tts.getResourceStatus().getAvailableSpace();
-    if(availSpace < outSize) {
-      LOG.warn("No room for reduce task. Node " + taskTracker + " has " +
-                availSpace + 
-               " bytes free; but we expect reduce input to take " + outSize);
-
-      return -1; //see if a different TIP might work better. 
-    }
-    
     // 1. check for a never-executed reduce tip
     // reducers don't have a cache and so pass -1 to explicitly call that out
     tip = findTaskFromList(nonRunningReduces, tts, numUniqueHosts, false);