From 0e3d5f3064e73f9f3b1dc942b556f8aa471932cf Mon Sep 17 00:00:00 2001
From: Weiwei Yang <wwei@apache.org>
Date: Tue, 22 Jan 2019 10:23:32 +0800
Subject: [PATCH] YARN-9210. RM nodes web page can not display node info.
 Contributed by Jiandan Yang.

(cherry picked from commit d43df31751bcadab77d42b31e3e1dd5748b471b5)
---
 .../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 10948ea8317..dbcf54e9650 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
@@ -166,7 +166,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("<br title='").append(String.valueOf(usedMemory))
             .append("'>").append(StringUtils.byteDesc(usedMemory * BYTES_IN_MB))
@@ -201,9 +201,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.__().__();
     }
   }