hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s..@apache.org
Subject svn commit: r1170918 - in /hadoop/common/branches/branch-0.22/mapreduce: CHANGES.txt src/webapps/job/queueinfo.jsp
Date Thu, 15 Sep 2011 01:41:21 GMT
Author: shv
Date: Thu Sep 15 01:41:21 2011
New Revision: 1170918

URL: http://svn.apache.org/viewvc?rev=1170918&view=rev
Log:
MAPREDUCE-2991. queueinfo.jsp fails if queue names contain special symbols. Contributed by
Priyo Mustafi.

Modified:
    hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt
    hadoop/common/branches/branch-0.22/mapreduce/src/webapps/job/queueinfo.jsp

Modified: hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt?rev=1170918&r1=1170917&r2=1170918&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt Thu Sep 15 01:41:21 2011
@@ -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

Modified: hadoop/common/branches/branch-0.22/mapreduce/src/webapps/job/queueinfo.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/mapreduce/src/webapps/job/queueinfo.jsp?rev=1170918&r1=1170917&r2=1170918&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/mapreduce/src/webapps/job/queueinfo.jsp (original)
+++ hadoop/common/branches/branch-0.22/mapreduce/src/webapps/job/queueinfo.jsp Thu Sep 15
01:41:21 2011
@@ -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(



Mime
View raw message