From 3d992825b17ca81cc6bc23aaf81aa68e05bbbb9a Mon Sep 17 00:00:00 2001 From: bc Wong Date: Wed, 5 Mar 2014 23:21:34 -0800 Subject: [PATCH] YARN-1790. FairScheduler UI not showing apps table Also ported YARN-563 to FairScheduler UI --- .../yarn/server/resourcemanager/webapp/FairSchedulerAppsBlock.java | 5 ++++- .../hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerAppsBlock.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerAppsBlock.java index 406d730..6bbcb2b 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerAppsBlock.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerAppsBlock.java @@ -68,6 +68,7 @@ th(".id", "ID"). th(".user", "User"). th(".name", "Name"). + th(".type", "Application Type"). th(".queue", "Queue"). th(".fairshare", "Fair Share"). th(".starttime", "StartTime"). @@ -88,7 +89,7 @@ } 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); @@ -104,6 +105,8 @@ .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("\",\"") .append(appInfo.getStartTime()).append("\",\"") diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java index 73ab420..a4f2e4d 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/FairSchedulerPage.java @@ -246,7 +246,7 @@ protected String getAppsTableColumnDefs() { .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]") -- 1.8.3.4 (Apple Git-47)