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

YARN-1790. Fair Scheduler UI not showing apps table (bc Wong via Sandy Ryza) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1575487 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sanford Ryza 2014-03-08 05:12:45 +00:00
parent 874cc955e0
commit e2530de4ea
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,8 @@ Release 2.5.0 - UNRELEASED
YARN-1718. Fix a couple isTerminals in Fair Scheduler queue placement rules YARN-1718. Fix a couple isTerminals in Fair Scheduler queue placement rules
(Sandy Ryza) (Sandy Ryza)
YARN-1790. Fair Scheduler UI not showing apps table (bc Wong via Sandy Ryza)
Release 2.4.0 - UNRELEASED Release 2.4.0 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

5
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerAppsBlock.java
View File

@ -72,6 +72,7 @@ public class FairSchedulerAppsBlock extends HtmlBlock {
th(".id", "ID"). th(".id", "ID").
th(".user", "User"). th(".user", "User").
th(".name", "Name"). th(".name", "Name").
th(".type", "Application Type").
th(".queue", "Queue"). th(".queue", "Queue").
th(".fairshare", "Fair Share"). th(".fairshare", "Fair Share").
th(".starttime", "StartTime"). th(".starttime", "StartTime").
@ -92,7 +93,7 @@ public class FairSchedulerAppsBlock extends HtmlBlock {
} }
StringBuilder appsTableData = new StringBuilder("[\n"); StringBuilder appsTableData = new StringBuilder("[\n");
for (RMApp app : apps.values()) { for (RMApp app : apps.values()) {
if (reqAppStates != null && !reqAppStates.contains(app.getState())) { if (reqAppStates != null && !reqAppStates.contains(app.createApplicationState())) {
continue; continue;
} }
AppInfo appInfo = new AppInfo(app, true, WebAppUtils.getHttpSchemePrefix(conf)); AppInfo appInfo = new AppInfo(app, true, WebAppUtils.getHttpSchemePrefix(conf));
@ -107,6 +108,8 @@ public class FairSchedulerAppsBlock extends HtmlBlock {
appInfo.getUser()))).append("\",\"") appInfo.getUser()))).append("\",\"")
.append(StringEscapeUtils.escapeJavaScript(StringEscapeUtils.escapeHtml( .append(StringEscapeUtils.escapeJavaScript(StringEscapeUtils.escapeHtml(
appInfo.getName()))).append("\",\"") appInfo.getName()))).append("\",\"")
.append(StringEscapeUtils.escapeJavaScript(StringEscapeUtils.escapeHtml(
appInfo.getApplicationType()))).append("\",\"")
.append(StringEscapeUtils.escapeJavaScript(StringEscapeUtils.escapeHtml( .append(StringEscapeUtils.escapeJavaScript(StringEscapeUtils.escapeHtml(
appInfo.getQueue()))).append("\",\"") appInfo.getQueue()))).append("\",\"")
.append(fairShare).append("\",\"") .append(fairShare).append("\",\"")

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java
View File

@ -246,7 +246,7 @@ protected String getAppsTableColumnDefs() {
.append("{'sType':'numeric', 'aTargets': [0]") .append("{'sType':'numeric', 'aTargets': [0]")
.append(", 'mRender': parseHadoopID }") .append(", 'mRender': parseHadoopID }")
.append("\n, {'sType':'numeric', 'aTargets': [5, 6]") .append("\n, {'sType':'numeric', 'aTargets': [6, 7]")
.append(", 'mRender': renderHadoopDate }") .append(", 'mRender': renderHadoopDate }")
.append("\n, {'sType':'numeric', bSearchable:false, 'aTargets': [9]") .append("\n, {'sType':'numeric', bSearchable:false, 'aTargets': [9]")