From 9704960e42f6858225c3a6ada0892e4344ebed0d Mon Sep 17 00:00:00 2001 From: Konstantin Shvachko Date: Thu, 15 Sep 2011 01:38:44 +0000 Subject: [PATCH] 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 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ hadoop-mapreduce-project/src/webapps/job/queueinfo.jsp | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 8ed6f5e283..ac2f7c94ce 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -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 diff --git a/hadoop-mapreduce-project/src/webapps/job/queueinfo.jsp b/hadoop-mapreduce-project/src/webapps/job/queueinfo.jsp index 305f0ad78f..0825fe9af5 100644 --- a/hadoop-mapreduce-project/src/webapps/job/queueinfo.jsp +++ b/hadoop-mapreduce-project/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(