Repository: hadoop Updated Branches: refs/heads/branch-3.0 c9c4511a0 -> 15057a7e6
YARN-9036. Escape newlines in health report in YARN UI. Contributed by Keqiu Hu (cherry picked from commit c3d10aa6eddadd0e00edfb87cc77c9483ec8fb13) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/15057a7e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/15057a7e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/15057a7e Branch: refs/heads/branch-3.0 Commit: 15057a7e67791bb7cc5717a92efd133446737217 Parents: c9c4511 Author: Jonathan Hung <[email protected]> Authored: Fri Nov 30 09:51:05 2018 -0800 Committer: Jonathan Hung <[email protected]> Committed: Fri Nov 30 10:17:26 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/15057a7e/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 d0e384d..10948ea 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.lang.StringEscapeUtils; import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.yarn.api.records.NodeState; import org.apache.hadoop.yarn.conf.YarnConfiguration; @@ -200,8 +201,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]
