Apache/hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-9210. RM nodes web page can not display node info. Contributed by Jiandan Yang.

Browse Source 
(cherry picked from commit d43df31751bcadab77d42b31e3e1dd5748b471b5)
This commit is contained in:
Weiwei Yang 2019-01-22 10:23:32 +08:00
parent 80b9fecaaf
commit 0e3d5f3064
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java
View File

@ -166,7 +166,7 @@ protected void render(Block html) {
nodeTableData.append("<br title='") nodeTableData.append("<br title='")
.append(String.valueOf(info.getLastHealthUpdate())).append("'>") .append(String.valueOf(info.getLastHealthUpdate())).append("'>")
.append(Times.format(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(String.valueOf(info.getNumContainers())).append("\",\"")
.append("<br title='").append(String.valueOf(usedMemory)) .append("<br title='").append(String.valueOf(usedMemory))
.append("'>").append(StringUtils.byteDesc(usedMemory * BYTES_IN_MB)) .append("'>").append(StringUtils.byteDesc(usedMemory * BYTES_IN_MB))
@ -201,9 +201,8 @@ protected void render(Block html) {
nodeTableData.length() - 1); nodeTableData.length() - 1);
} }
nodeTableData.append("]"); nodeTableData.append("]");
String nodeTableDataEscaped = StringEscapeUtils.escapeJava(nodeTableData.toString());
html.script().$type("text/javascript") html.script().$type("text/javascript")
.__("var nodeTableData=" + nodeTableDataEscaped).__(); .__("var nodeTableData=" + nodeTableData).__();
tbody.__().__(); tbody.__().__();
} }
} }