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

YARN-3766. Fixed the apps table column error of generic history web UI. Contributed by Xuan Gong.

This commit is contained in:
Zhijie Shen 2015-06-04 14:46:32 -07:00
parent 405bbcf68c
commit 18dd01d6bf
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -490,6 +490,9 @@ Release 2.8.0 - UNRELEASED
YARN-3749. We should make a copy of configuration when init MiniYARNCluster YARN-3749. We should make a copy of configuration when init MiniYARNCluster
with multiple RMs. (Chun Chen via xgong) 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 Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

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

@ -40,7 +40,7 @@ public class AHSView extends TwoColumnLayout {
protected void preHead(Page.HTML<_> html) { protected void preHead(Page.HTML<_> html) {
commonPreHead(html); commonPreHead(html);
set(DATATABLES_ID, "apps"); 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}"); setTableStyles(html, "apps", ".queue {width:6em}", ".ui {width:8em}");
// Set the correct title. // Set the correct title.

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/WebPageUtils.java
View File

@ -27,6 +27,10 @@ public class WebPageUtils {
return appsTableInit(false, true); return appsTableInit(false, true);
} }
public static String appsTableInit(boolean isResourceManager) {
return appsTableInit(false, isResourceManager);
}
public static String appsTableInit( public static String appsTableInit(
boolean isFairSchedulerPage, boolean isResourceManager) { boolean isFairSchedulerPage, boolean isResourceManager) {
// id, user, name, queue, starttime, finishtime, state, status, progress, ui // id, user, name, queue, starttime, finishtime, state, status, progress, ui