Repository: hadoop Updated Branches: refs/heads/branch-3.2 69be6e735 -> 6b01e4d2a
YARN-9036. Escape newlines in health report in YARN UI. Contributed by Keqiu Hu (cherry picked from commit 1c8bd7128c99d8215ef16438bd2ce6b1f025a966) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6b01e4d2 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6b01e4d2 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6b01e4d2 Branch: refs/heads/branch-3.2 Commit: 6b01e4d2a89e1756e070b01695bee79afccba63b Parents: 69be6e7 Author: Jonathan Hung <[email protected]> Authored: Thu Nov 29 17:02:07 2018 -0800 Committer: Jonathan Hung <[email protected]> Committed: Fri Nov 30 10:16:00 2018 -0800 ---------------------------------------------------------------------- .../hadoop/yarn/server/resourcemanager/webapp/NodesPage.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6b01e4d2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/NodesPage.java ---------------------------------------------------------------------- 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 09b1c0f..cb92baf 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 @@ -19,6 +19,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; import com.google.inject.Inject; +import org.apache.commons.text.StringEscapeUtils; import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.yarn.api.records.NodeState; import org.apache.hadoop.yarn.conf.YarnConfiguration; @@ -203,8 +204,9 @@ class NodesPage extends RmView { nodeTableData.length() - 1); } nodeTableData.append("]"); + String nodeTableDataEscaped = StringEscapeUtils.escapeJava(nodeTableData.toString()); html.script().$type("text/javascript") - .__("var nodeTableData=" + nodeTableData).__(); + .__("var nodeTableData=" + nodeTableDataEscaped).__(); tbody.__().__(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
