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:
parent
874cc955e0
commit
e2530de4ea
|
@ -42,6 +42,8 @@ Release 2.5.0 - UNRELEASED
|
|||
YARN-1718. Fix a couple isTerminals in Fair Scheduler queue placement rules
|
||||
(Sandy Ryza)
|
||||
|
||||
YARN-1790. Fair Scheduler UI not showing apps table (bc Wong via Sandy Ryza)
|
||||
|
||||
Release 2.4.0 - UNRELEASED
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
|
@ -72,6 +72,7 @@ public class FairSchedulerAppsBlock extends HtmlBlock {
|
|||
th(".id", "ID").
|
||||
th(".user", "User").
|
||||
th(".name", "Name").
|
||||
th(".type", "Application Type").
|
||||
th(".queue", "Queue").
|
||||
th(".fairshare", "Fair Share").
|
||||
th(".starttime", "StartTime").
|
||||
|
@ -92,7 +93,7 @@ public class FairSchedulerAppsBlock extends HtmlBlock {
|
|||
}
|
||||
StringBuilder appsTableData = new StringBuilder("[\n");
|
||||
for (RMApp app : apps.values()) {
|
||||
if (reqAppStates != null && !reqAppStates.contains(app.getState())) {
|
||||
if (reqAppStates != null && !reqAppStates.contains(app.createApplicationState())) {
|
||||
continue;
|
||||
}
|
||||
AppInfo appInfo = new AppInfo(app, true, WebAppUtils.getHttpSchemePrefix(conf));
|
||||
|
@ -107,6 +108,8 @@ public class FairSchedulerAppsBlock extends HtmlBlock {
|
|||
appInfo.getUser()))).append("\",\"")
|
||||
.append(StringEscapeUtils.escapeJavaScript(StringEscapeUtils.escapeHtml(
|
||||
appInfo.getName()))).append("\",\"")
|
||||
.append(StringEscapeUtils.escapeJavaScript(StringEscapeUtils.escapeHtml(
|
||||
appInfo.getApplicationType()))).append("\",\"")
|
||||
.append(StringEscapeUtils.escapeJavaScript(StringEscapeUtils.escapeHtml(
|
||||
appInfo.getQueue()))).append("\",\"")
|
||||
.append(fairShare).append("\",\"")
|
||||
|
|
|
@ -246,7 +246,7 @@ public class FairSchedulerPage extends RmView {
|
|||
.append("{'sType':'numeric', 'aTargets': [0]")
|
||||
.append(", 'mRender': parseHadoopID }")
|
||||
|
||||
.append("\n, {'sType':'numeric', 'aTargets': [5, 6]")
|
||||
.append("\n, {'sType':'numeric', 'aTargets': [6, 7]")
|
||||
.append(", 'mRender': renderHadoopDate }")
|
||||
|
||||
.append("\n, {'sType':'numeric', bSearchable:false, 'aTargets': [9]")
|
||||
|
|
Loading…
Reference in New Issue