Browse Source

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

(cherry picked from commit 18dd01d6bf67f4d522b947454c1f4347d1cbbc19)
Zhijie Shen 10 năm trước cách đây
mục cha
commit
8f04ac9c34

+ 3 - 0
hadoop-yarn-project/CHANGES.txt

@@ -442,6 +442,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

+ 1 - 1
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.

+ 4 - 0
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