瀏覽代碼

MAPREDUCE-4706. FairScheduler#dump(): Computing of # running maps and reduces is commented out. Contributed by Karthik Kambatla.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1395520 13f79535-47bb-0310-9956-ffa450edef68
Thomas White 13 年之前
父節點
當前提交
b1c15753fd
共有 2 個文件被更改,包括 5 次插入10 次删除
  1. 3 0
      CHANGES.txt
  2. 2 10
      src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FairScheduler.java

+ 3 - 0
CHANGES.txt

@@ -233,6 +233,9 @@ Release 1.2.0 - unreleased
     (default behavior in Ubuntu).
     (Christopher Berner and Andy Isaacson via harsh)
 
+    MAPREDUCE-4706. FairScheduler#dump(): Computing of # running maps and
+    reduces is commented out. (Karthik Kambatla via tomwhite)
+
 Release 1.1.0 - unreleased
 
   INCOMPATIBLE CHANGES

+ 2 - 10
src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FairScheduler.java

@@ -1082,16 +1082,8 @@ public class FairScheduler extends TaskScheduler {
           else return p1.getName().compareTo(p2.getName());
         }});
       for (Pool pool: pools) {
-        int runningMaps = 0;
-        int runningReduces = 0;
-        for (JobInProgress job: pool.getJobs()) {
-          JobInfo info = infos.get(job);
-          if (info != null) {
-            // TODO: Fix
-            //runningMaps += info.runningMaps;
-            //runningReduces += info.runningReduces;
-          }
-        }
+        int runningMaps = pool.getMapSchedulable().getRunningTasks();
+        int runningReduces = pool.getReduceSchedulable().getRunningTasks();
         String name = pool.getName();
         eventLog.log("POOL",
             name, poolMgr.getPoolWeight(name), pool.getJobs().size(),