Ver Fonte

MAPREDUCE-2991. queueinfo.jsp fails if queue names contain special symbols. Contributed by Priyo Mustafi.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.22@1170918 13f79535-47bb-0310-9956-ffa450edef68
Konstantin Shvachko há 13 anos atrás
pai
commit
63ce9bbae0
2 ficheiros alterados com 6 adições e 1 exclusões
  1. 3 0
      mapreduce/CHANGES.txt
  2. 3 1
      mapreduce/src/webapps/job/queueinfo.jsp

+ 3 - 0
mapreduce/CHANGES.txt

@@ -603,6 +603,9 @@ Release 0.22.0 - Unreleased
     MAPREDUCE-2940. Build fails with ant 1.7.0 but works with 1.8.0
     (Joep Rottinghuis via shv)
 
+    MAPREDUCE-2991. queueinfo.jsp fails to show queue status for Capacity 
+    scheduler if queue names contain special symbols. (Priyo Mustafi via shv)
+
 Release 0.21.1 - Unreleased
 
   NEW FEATURES

+ 3 - 1
mapreduce/src/webapps/job/queueinfo.jsp

@@ -21,6 +21,7 @@
 <%@ page
 contentType="text/html; charset=UTF-8"
 import="org.apache.hadoop.mapred.*"
+import="org.apache.commons.lang.StringUtils"
 import="javax.servlet.*"
 import="javax.servlet.http.*"
 import="java.io.*"
@@ -51,7 +52,8 @@ import="java.util.*"
       return "";
     }
     for (JobQueueInfo queueInfo : children) {
-      String variableName = queueInfo.getQueueName().replace(":", "_");
+      String variableName = StringUtils.replaceChars(queueInfo.getQueueName(),  
+                                 ":-*+#.^", "_______");
       String label = queueInfo.getQueueName().split(":")[queueInfo
           .getQueueName().split(":").length - 1];
       str.append(String.format(