Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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@1532096 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sanford Ryza 2013-10-14 21:07:55 +00:00
parent 34beb4eb79
commit 59e7d9f5c2
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-yarn-project/CHANGES.txt
View File

@ -96,7 +96,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)
>>>>>>> .merge-right.r1531447 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

4
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
View File

@ -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;
} }
} }