This is an automated email from the ASF dual-hosted git repository.
snemeth pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 6459cc7 YARN-10318. ApplicationHistory Web UI incorrect column
indexing. Contributed by Andras Gyori
6459cc7 is described below
commit 6459cc73e6c0878be51c0f2f70ec9868325dec34
Author: Szilard Nemeth <[email protected]>
AuthorDate: Fri Jun 26 13:15:14 2020 +0200
YARN-10318. ApplicationHistory Web UI incorrect column indexing.
Contributed by Andras Gyori
---
.../main/java/org/apache/hadoop/yarn/server/webapp/AppsBlock.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppsBlock.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppsBlock.java
index b89ca02..6737e4d 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppsBlock.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/webapp/AppsBlock.java
@@ -150,7 +150,8 @@ public class AppsBlock extends HtmlBlock {
TBODY<TABLE<Hamlet>> tbody =
html.table("#apps").thead().tr().th(".id", "ID").th(".user", "User")
.th(".name", "Name").th(".type", "Application Type")
- .th(".queue", "Queue").th(".priority", "Application Priority")
+ .th(".apptag", "Application Tags").th(".queue", "Queue")
+ .th(".priority", "Application Priority")
.th(".starttime", "StartTime")
.th(".launchtime", "LaunchTime")
.th(".finishtime", "FinishTime")
@@ -185,6 +186,10 @@ public class AppsBlock extends HtmlBlock {
.append(
StringEscapeUtils.escapeEcmaScript(StringEscapeUtils.escapeHtml4(app
.getType())))
+ .append("\",\"")
+ .append(
+ StringEscapeUtils.escapeEcmaScript(StringEscapeUtils.escapeHtml4(
+ app.getApplicationTags() == null ? "" :
app.getApplicationTags())))
.append("\",\"")
.append(
StringEscapeUtils.escapeEcmaScript(StringEscapeUtils.escapeHtml4(app
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
