Repository: hadoop Updated Branches: refs/heads/trunk 405bbcf68 -> 18dd01d6b
YARN-3766. Fixed the apps table column error of generic history web UI. Contributed by Xuan Gong. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/18dd01d6 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/18dd01d6 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/18dd01d6 Branch: refs/heads/trunk Commit: 18dd01d6bf67f4d522b947454c1f4347d1cbbc19 Parents: 405bbcf Author: Zhijie Shen <[email protected]> Authored: Thu Jun 4 14:46:32 2015 -0700 Committer: Zhijie Shen <[email protected]> Committed: Thu Jun 4 14:47:08 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../yarn/server/applicationhistoryservice/webapp/AHSView.java | 2 +- .../java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/18dd01d6/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 5a9d8ca..8b922e2 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -490,6 +490,9 @@ Release 2.8.0 - UNRELEASED YARN-3749. We should make a copy of configuration when init MiniYARNCluster with multiple RMs. (Chun Chen via xgong) + YARN-3766. Fixed the apps table column error of generic history web UI. + (Xuan Gong via zjshen) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/18dd01d6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSView.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSView.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSView.java index 152364e..65b5ac1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSView.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/AHSView.java @@ -40,7 +40,7 @@ public class AHSView extends TwoColumnLayout { protected void preHead(Page.HTML<_> html) { commonPreHead(html); set(DATATABLES_ID, "apps"); - set(initID(DATATABLES, "apps"), WebPageUtils.appsTableInit()); + set(initID(DATATABLES, "apps"), WebPageUtils.appsTableInit(false)); setTableStyles(html, "apps", ".queue {width:6em}", ".ui {width:8em}"); // Set the correct title. http://git-wip-us.apache.org/repos/asf/hadoop/blob/18dd01d6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java index ed0fe38..df63b77 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java @@ -27,6 +27,10 @@ public class WebPageUtils { return appsTableInit(false, true); } + public static String appsTableInit(boolean isResourceManager) { + return appsTableInit(false, isResourceManager); + } + public static String appsTableInit( boolean isFairSchedulerPage, boolean isResourceManager) { // id, user, name, queue, starttime, finishtime, state, status, progress, ui
