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 06a5f1df144..9e3e01398df 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 @@ -33,7 +33,8 @@ public static String appsTableInit(boolean isResourceManager) { public static String appsTableInit( boolean isFairSchedulerPage, boolean isResourceManager) { - // id, user, name, queue, starttime, finishtime, state, status, progress, ui + // id, user, name, app type, app tags, queue, priority, + // starttime, launchtime, finishtime, state, status, progress, ui // FairSchedulerPage's table is a bit different return tableInit() .append(", 'aaData': appsTableData") @@ -53,16 +54,18 @@ private static String getAppsTableColumnDefs( sb.append("[\n") .append("{'sType':'natural', 'aTargets': [0]") .append(", 'mRender': parseHadoopID }") - .append("\n, {'sType':'num-ignore-str', 'aTargets': [6, 7, 8]") + .append("\n, {'sType':'num-ignore-str', 'aTargets': [7, 8, 9]") .append(", 'mRender': renderHadoopDate }"); if (isResourceManager) { // Update following line if any column added in RM page before column 11 - sb.append("\n, {'sType':'num-ignore-str', 'aTargets': [11, 12, 13, 14, 15] }"); - // set progress column index to 18 - progressIndex = "[18]"; + sb.append("\n, {'sType':'num-ignore-str', ") + .append("'aTargets': [12, 13, 14, 15, 16] }"); + // set progress column index to 19 + progressIndex = "[19]"; } else if (isFairSchedulerPage) { // Update following line if any column added in scheduler page before column 11 - sb.append("\n, {'sType':'num-ignore-str', 'aTargets': [11, 12, 13, 14, 15] }"); + sb.append("\n, {'sType':'num-ignore-str', ") + .append("'aTargets': [11, 12, 13, 14, 15] }"); // set progress column index to 16 progressIndex = "[16]"; }