You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by sh...@apache.org on 2011/09/15 03:38:44 UTC
svn commit: r1170917 - in /hadoop/common/trunk/hadoop-mapreduce-project:
CHANGES.txt src/webapps/job/queueinfo.jsp
Author: shv
Date: Thu Sep 15 01:38:44 2011
New Revision: 1170917
URL: http://svn.apache.org/viewvc?rev=1170917&view=rev
Log:
MAPREDUCE-2991. queueinfo.jsp fails if queue names contain special symbols. Contributed by Priyo Mustafi.
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/trunk/hadoop-mapreduce-project/src/webapps/job/queueinfo.jsp
Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1170917&r1=1170916&r2=1170917&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Thu Sep 15 01:38:44 2011
@@ -1903,6 +1903,9 @@ Release 0.22.0 - Unreleased
MAPREDUCE-2767. Remove Linux task-controller. (Milind Bhandarkar 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/trunk/hadoop-mapreduce-project/src/webapps/job/queueinfo.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/src/webapps/job/queueinfo.jsp?rev=1170917&r1=1170916&r2=1170917&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/src/webapps/job/queueinfo.jsp (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/src/webapps/job/queueinfo.jsp Thu Sep 15 01:38:44 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(