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 ww...@apache.org on 2019/01/22 02:34:36 UTC
[hadoop] branch trunk updated: YARN-9210. RM nodes web page can not
display node info. Contributed by Jiandan Yang.
This is an automated email from the ASF dual-hosted git repository.
wwei 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 d43df31 YARN-9210. RM nodes web page can not display node info. Contributed by Jiandan Yang.
d43df31 is described below
commit d43df31751bcadab77d42b31e3e1dd5748b471b5
Author: Weiwei Yang <ww...@apache.org>
AuthorDate: Tue Jan 22 10:23:32 2019 +0800
YARN-9210. RM nodes web page can not display node info. Contributed by Jiandan Yang.
---
.../apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java
index cb92baf..4dfb9d9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java
@@ -168,7 +168,7 @@ class NodesPage extends RmView {
nodeTableData.append("<br title='")
.append(String.valueOf(info.getLastHealthUpdate())).append("'>")
.append(Times.format(info.getLastHealthUpdate())).append("\",\"")
- .append(info.getHealthReport()).append("\",\"")
+ .append(StringEscapeUtils.escapeJava(info.getHealthReport())).append("\",\"")
.append(String.valueOf(info.getNumContainers())).append("\",\"")
.append(info.getAllocationTagsSummary()).append("\",\"")
.append("<br title='").append(String.valueOf(usedMemory))
@@ -204,9 +204,8 @@ class NodesPage extends RmView {
nodeTableData.length() - 1);
}
nodeTableData.append("]");
- String nodeTableDataEscaped = StringEscapeUtils.escapeJava(nodeTableData.toString());
html.script().$type("text/javascript")
- .__("var nodeTableData=" + nodeTableDataEscaped).__();
+ .__("var nodeTableData=" + nodeTableData).__();
tbody.__().__();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org