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 b89ca02e09..6737e4d8fa 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 @@ protected void renderData(Block html) {
TBODY
> 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 @@ protected void renderData(Block html) {
.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