Browse Source

YARN-1259. In Fair Scheduler web UI, queue num pending and num active apps switched. (Robert Kanter via Sandy Ryza)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.2@1532097 13f79535-47bb-0310-9956-ffa450edef68
Sanford Ryza 11 years ago
parent
commit
ed4adc6455

+ 3 - 0
hadoop-yarn-project/CHANGES.txt

@@ -30,6 +30,9 @@ Release 2.2.1 - UNRELEASED
     YARN-1044. used/min/max resources do not display info in the scheduler page
     YARN-1044. used/min/max resources do not display info in the scheduler page
     (Sangjin Lee via Sandy Ryza)
     (Sangjin Lee via Sandy Ryza)
 
 
+    YARN-1259. In Fair Scheduler web UI, queue num pending and num active apps
+    switched. (Robert Kanter via Sandy Ryza)
+
 Release 2.2.0 - 2013-10-13
 Release 2.2.0 - 2013-10-13
 
 
   INCOMPATIBLE CHANGES
   INCOMPATIBLE CHANGES

+ 2 - 2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/FairSchedulerLeafQueueInfo.java

@@ -50,10 +50,10 @@ public class FairSchedulerLeafQueueInfo extends FairSchedulerQueueInfo {
   }
   }
   
   
   public int getNumActiveApplications() {
   public int getNumActiveApplications() {
-    return numPendingApps;
+    return numActiveApps;
   }
   }
   
   
   public int getNumPendingApplications() {
   public int getNumPendingApplications() {
-    return numActiveApps;
+    return numPendingApps;
   }
   }
 }
 }