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/trunk@1170917 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Konstantin Shvachko 2011-09-15 01:38:44 +00:00
parent 5183e88109
commit 9704960e42
2 changed files with 6 additions and 1 deletions

View File

@ -1903,6 +1903,9 @@ Release 0.22.0 - Unreleased
MAPREDUCE-2767. Remove Linux task-controller. (Milind Bhandarkar via shv) 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 Release 0.21.1 - Unreleased
NEW FEATURES NEW FEATURES

View File

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