You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ep...@apache.org on 2019/05/02 20:18:07 UTC
[hadoop] branch branch-3.1 updated: YARN-9285: RM UI progress
column is of wrong type. Contributed by Ahmed Hussein.
This is an automated email from the ASF dual-hosted git repository.
epayne pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 41ffaea YARN-9285: RM UI progress column is of wrong type. Contributed by Ahmed Hussein.
41ffaea is described below
commit 41ffaea34292aa1011a5f87c336fb12924f2e948
Author: Eric E Payne <er...@verizonmedia.com>
AuthorDate: Thu May 2 19:39:26 2019 +0000
YARN-9285: RM UI progress column is of wrong type. Contributed by Ahmed Hussein.
(cherry picked from commit b094b94d43a46af9ddb910da24f792b95f614b08)
---
.../hadoop/yarn/server/webapp/WebPageUtils.java | 24 ++++++++++++++--------
1 file changed, 15 insertions(+), 9 deletions(-)
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 8ab5de1..06a5f1d 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
@@ -47,21 +47,27 @@ public class WebPageUtils {
private static String getAppsTableColumnDefs(
boolean isFairSchedulerPage, boolean isResourceManager) {
+ // default progress column index is 11
+ String progressIndex = "[11]";
StringBuilder sb = new StringBuilder();
sb.append("[\n")
.append("{'sType':'natural', 'aTargets': [0]")
.append(", 'mRender': parseHadoopID }")
.append("\n, {'sType':'num-ignore-str', 'aTargets': [6, 7, 8]")
- .append(", 'mRender': renderHadoopDate }")
- .append("\n, {'sType':'num-ignore-str', 'aTargets': [11, 12, 13, 14, 15] }")
- .append("\n, {'sType':'numeric', bSearchable:false, 'aTargets':");
- if (isFairSchedulerPage) {
- sb.append("[15]");
- } else if (isResourceManager) {
- sb.append("[17]");
- } else {
- sb.append("[10]");
+ .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]";
+ } 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] }");
+ // set progress column index to 16
+ progressIndex = "[16]";
}
+ sb.append("\n, {'sType':'numeric', bSearchable:false, 'aTargets':");
+ sb.append(progressIndex);
sb.append(", 'mRender': parseHadoopProgress }]");
return sb.toString();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org