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

YARN-9036. Escape newlines in health report in YARN UI. Contributed by Keqiu Hu

This commit is contained in:
Jonathan Hung 2018-11-30 10:04:06 -08:00 committed by Jonathan Hung
parent a3470c65d8
commit 7456da99c1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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

@ -19,6 +19,7 @@
package org.apache.hadoop.yarn.server.resourcemanager.webapp; package org.apache.hadoop.yarn.server.resourcemanager.webapp;
import com.google.inject.Inject; import com.google.inject.Inject;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.util.StringUtils;
import org.apache.hadoop.yarn.api.records.NodeState; import org.apache.hadoop.yarn.api.records.NodeState;
import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.conf.YarnConfiguration;
@ -200,8 +201,9 @@ class NodesPage extends RmView {
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=" + nodeTableData)._(); ._("var nodeTableData=" + nodeTableDataEscaped)._();
tbody._()._(); tbody._()._();
} }
} }