Fix diagnostic display #apps > 100. (llu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-279@1139141 13f79535-47bb-0310-9956-ffa450edef68

mapreduce/CHANGES.txt

@@ -5,6 +5,8 @@ Trunk (unreleased changes)
 
     MAPREDUCE-279
     
+    Fix diagnostics display for more than 100 apps in RM. (llu)
+
     Fix class cast exception in release reserved containers in capacity scheduler (mahadev)
 
     MAPREDUCE-2615. Make killJob go through AM and fix JobSummaryLog.

mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/AppsList.java

@@ -69,7 +69,8 @@ class AppsList implements ToJSON {
       appendProgressBar(out, app.getStatus().getProgress()).append(_SEP);
       appendLink(out, ui, rc.prefix(),
                  trackingUrl == null ? "#" : "http://", trackingUrl).
-          append(_SEP).append(escapeHtml(app.getMaster().getDiagnostics())).
+          append(_SEP).append(escapeJavaScript(escapeHtml(
+                              app.getMaster().getDiagnostics()))).
           append("\"]");
     }
     out.append(']');

mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/MockAsm.java

@@ -281,7 +281,7 @@ public abstract class MockAsm extends MockApps {
       public String getDiagnostics() {
         switch (getState()) {
           case FAILED: return "Application was failed";
-          case KILLED: return "Appiication was killed. yada yada yada.";
+          case KILLED: return "Appiication was killed.\nyada yada yada.";
         }
         return "";
       }

mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebApp.java

@@ -148,6 +148,6 @@ public class TestRMWebApp {
   public static void main(String[] args) throws Exception {
     // For manual testing
     WebApps.$for("yarn", new TestRMWebApp()).at(8888).inDevMode().
-        start(new RMWebApp(mockRm(88, 8, 8, 8*GiB))).joinThread();
+        start(new RMWebApp(mockRm(101, 8, 8, 8*GiB))).joinThread();
   }
 }