Return-Path: Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Received: (qmail 3703 invoked from network); 28 Feb 2011 17:06:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 28 Feb 2011 17:06:56 -0000 Received: (qmail 75207 invoked by uid 500); 28 Feb 2011 17:06:56 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 75085 invoked by uid 500); 28 Feb 2011 17:06:55 -0000 Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mapreduce-dev@hadoop.apache.org Delivered-To: mailing list mapreduce-commits@hadoop.apache.org Received: (qmail 75075 invoked by uid 99); 28 Feb 2011 17:06:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Feb 2011 17:06:55 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Feb 2011 17:06:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EDB6323889D7; Mon, 28 Feb 2011 17:06:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1075423 - in /hadoop/mapreduce/branches/branch-0.22: CHANGES.txt src/java/org/apache/hadoop/mapred/JSPUtil.java Date: Mon, 28 Feb 2011 17:06:31 -0000 To: mapreduce-commits@hadoop.apache.org From: szetszwo@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110228170631.EDB6323889D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: szetszwo Date: Mon Feb 28 17:06:31 2011 New Revision: 1075423 URL: http://svn.apache.org/viewvc?rev=1075423&view=rev Log: MAPREDUCE-1159. Limit Job name in web UI to be 80 char long. Contributed by Harsh J Chouraria Modified: hadoop/mapreduce/branches/branch-0.22/CHANGES.txt hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/mapred/JSPUtil.java Modified: hadoop/mapreduce/branches/branch-0.22/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/CHANGES.txt?rev=1075423&r1=1075422&r2=1075423&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.22/CHANGES.txt (original) +++ hadoop/mapreduce/branches/branch-0.22/CHANGES.txt Mon Feb 28 17:06:31 2011 @@ -185,6 +185,9 @@ Release 0.22.0 - Unreleased MAPREDUCE-2314. configure files that are generated as part of the released tarball need to have executable bit set (rvs via cos) + MAPREDUCE-1159. Limit Job name in web UI to be 80 char long. (Harsh J + Chouraria via szetszwo) + OPTIMIZATIONS MAPREDUCE-1354. Enhancements to JobTracker for better performance and Modified: hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/mapred/JSPUtil.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/mapred/JSPUtil.java?rev=1075423&r1=1075422&r2=1075423&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/mapred/JSPUtil.java (original) +++ hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/mapred/JSPUtil.java Mon Feb 28 17:06:31 2011 @@ -330,6 +330,7 @@ class JSPUtil { int completedMaps = job.finishedMaps(); int completedReduces = job.finishedReduces(); String name = HtmlQuoting.quoteHtmlChars(profile.getJobName()); + String abbreviatedName = getAbbreviatedJobName(name); String jobpri = job.getPriority().toString(); String schedulingInfo = HtmlQuoting.quoteHtmlChars(job.getStatus().getSchedulingInfo()); @@ -348,8 +349,8 @@ class JSPUtil { + refresh + "\">" + jobid + "" + "" + jobpri + "" + "" + HtmlQuoting.quoteHtmlChars(profile.getUser()) + - "" + "" + ("".equals(name) ? " " : name) + "" + "" + "" + "" + ("".equals(abbreviatedName) ? " " : abbreviatedName) + "" + "" + StringUtils.formatPercent(status.mapProgress(), 2) + ServletUtil.percentageGraph(status.mapProgress() * 100, 80) + "" + desiredMaps + "" + completedMaps @@ -372,6 +373,10 @@ class JSPUtil { return sb.toString(); } + static String getAbbreviatedJobName(String name) { + return (name.length() > 80 ? name.substring(0,76) + "..." : name); + } + @SuppressWarnings("unchecked") public static String generateRetiredJobTable(JobTracker tracker, int rowId) throws IOException { @@ -411,7 +416,7 @@ class JSPUtil { "" + status.getJobPriority().toString() + "" + "" + HtmlQuoting.quoteHtmlChars(status.getUsername()) + "" + - "" + HtmlQuoting.quoteHtmlChars(status.getJobName()) + "" + + "" + HtmlQuoting.quoteHtmlChars(getAbbreviatedJobName(status.getJobName())) + "" + "" + JobStatus.getJobRunState(status.getRunState()) + "" + "" + new Date(status.getStartTime()) + "" + "" + new Date(status.getFinishTime()) + "" +