Return-Path: Delivered-To: apmail-lucene-hadoop-commits-archive@locus.apache.org Received: (qmail 1386 invoked from network); 20 Sep 2006 21:49:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 20 Sep 2006 21:49:49 -0000 Received: (qmail 43818 invoked by uid 500); 20 Sep 2006 21:49:49 -0000 Delivered-To: apmail-lucene-hadoop-commits-archive@lucene.apache.org Received: (qmail 43805 invoked by uid 500); 20 Sep 2006 21:49:48 -0000 Mailing-List: contact hadoop-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hadoop-dev@lucene.apache.org Delivered-To: mailing list hadoop-commits@lucene.apache.org Received: (qmail 43796 invoked by uid 99); 20 Sep 2006 21:49:48 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Sep 2006 14:49:48 -0700 X-ASF-Spam-Status: No, hits=-9.8 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received: from [140.211.166.113] ([140.211.166.113:49293] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP id 9F/3F-01963-A77B1154 for ; Wed, 20 Sep 2006 14:49:47 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 859321A981A; Wed, 20 Sep 2006 14:49:44 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r448356 - in /lucene/hadoop/trunk: ./ src/java/org/apache/hadoop/mapred/ src/java/org/apache/hadoop/util/ src/webapps/job/ Date: Wed, 20 Sep 2006 21:49:44 -0000 To: hadoop-commits@lucene.apache.org From: cutting@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060920214944.859321A981A@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: cutting Date: Wed Sep 20 14:49:43 2006 New Revision: 448356 URL: http://svn.apache.org/viewvc?view=rev&rev=448356 Log: HADOOP-551. Revert JobClient's console printout to only include a maximum of one update per percent of progress. Contributed by Owen. Modified: lucene/hadoop/trunk/CHANGES.txt lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobClient.java lucene/hadoop/trunk/src/java/org/apache/hadoop/util/StringUtils.java lucene/hadoop/trunk/src/webapps/job/jobdetails.jsp lucene/hadoop/trunk/src/webapps/job/jobtasks.jsp lucene/hadoop/trunk/src/webapps/job/jobtracker.jsp lucene/hadoop/trunk/src/webapps/job/taskdetails.jsp Modified: lucene/hadoop/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=448356&r1=448355&r2=448356 ============================================================================== --- lucene/hadoop/trunk/CHANGES.txt (original) +++ lucene/hadoop/trunk/CHANGES.txt Wed Sep 20 14:49:43 2006 @@ -39,6 +39,10 @@ 11. HADOOP-293. Report the full list of task error messages in the web ui, not just the most recent. (omalley via cutting) +12. HADOOP-551. Restore JobClient's console printouts to only include + a maximum of one update per one percent of progress. + (omalley via cutting) + Release 0.6.2 (unreleased) Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobClient.java URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobClient.java?view=diff&rev=448356&r1=448355&r2=448356 ============================================================================== --- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobClient.java (original) +++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobClient.java Wed Sep 20 14:49:43 2006 @@ -372,9 +372,9 @@ } running = jc.getJob(jobId); String report = - (" map " + StringUtils.formatPercent(running.mapProgress())+ + (" map " + StringUtils.formatPercent(running.mapProgress(), 0)+ " reduce " + - StringUtils.formatPercent(running.reduceProgress())); + StringUtils.formatPercent(running.reduceProgress(), 0)); if (!report.equals(lastReport)) { LOG.info(report); lastReport = report; Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/util/StringUtils.java URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/util/StringUtils.java?view=diff&rev=448356&r1=448355&r2=448356 ============================================================================== --- lucene/hadoop/trunk/src/java/org/apache/hadoop/util/StringUtils.java (original) +++ lucene/hadoop/trunk/src/java/org/apache/hadoop/util/StringUtils.java Wed Sep 20 14:49:43 2006 @@ -83,11 +83,19 @@ return oneDecimal.format(result) + suffix; } - private static DecimalFormat percentFormat = new DecimalFormat("0.00%"); - - public static String formatPercent(double done) { - final int scale = 10000; + /** + * Format a percentage for presentation to the user. + * @param done the percentage to format (0.0 to 1.0) + * @param digits the number of digits past the decimal point + * @return a string representation of the percentage + */ + public static String formatPercent(double done, int digits) { + DecimalFormat percentFormat = new DecimalFormat("0.00%"); + double scale = Math.pow(10.0, digits+2); double rounded = Math.floor(done * scale); + percentFormat.setDecimalSeparatorAlwaysShown(false); + percentFormat.setMinimumFractionDigits(digits); + percentFormat.setMaximumFractionDigits(digits); return percentFormat.format(rounded / scale); } Modified: lucene/hadoop/trunk/src/webapps/job/jobdetails.jsp URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/webapps/job/jobdetails.jsp?view=diff&rev=448356&r1=448355&r2=448356 ============================================================================== --- lucene/hadoop/trunk/src/webapps/job/jobdetails.jsp (original) +++ lucene/hadoop/trunk/src/webapps/job/jobdetails.jsp Wed Sep 20 14:49:43 2006 @@ -10,7 +10,6 @@ %> <%! - private static DecimalFormat percentFormat = new DecimalFormat("##0.00"); JobTracker tracker = JobTracker.getTracker(); String trackerName = StringUtils.simpleHostname(tracker.getJobTrackerMachine()); @@ -36,7 +35,7 @@ } out.print("" + kind + "" + - StringUtils.formatPercent(completePercent) + + StringUtils.formatPercent(completePercent, 2) + "" + totalTasks + "" + (totalTasks - runningTasks - finishedTasks) + "" + runningTasks + "" + Modified: lucene/hadoop/trunk/src/webapps/job/jobtasks.jsp URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/webapps/job/jobtasks.jsp?view=diff&rev=448356&r1=448355&r2=448356 ============================================================================== --- lucene/hadoop/trunk/src/webapps/job/jobtasks.jsp (original) +++ lucene/hadoop/trunk/src/webapps/job/jobtasks.jsp Wed Sep 20 14:49:43 2006 @@ -63,7 +63,7 @@ out.print("" + report.getTaskId() + ""); - out.print("" + StringUtils.formatPercent(report.getProgress()) + + out.print("" + StringUtils.formatPercent(report.getProgress(),2) + ""); out.print("" + report.getState() + ""); String[] diagnostics = report.getDiagnostics(); Modified: lucene/hadoop/trunk/src/webapps/job/jobtracker.jsp URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/webapps/job/jobtracker.jsp?view=diff&rev=448356&r1=448355&r2=448356 ============================================================================== --- lucene/hadoop/trunk/src/webapps/job/jobtracker.jsp (original) +++ lucene/hadoop/trunk/src/webapps/job/jobtracker.jsp Wed Sep 20 14:49:43 2006 @@ -44,10 +44,10 @@ "" + profile.getUser() + "" + "" + ("".equals(name) ? " " : name) + "" + "" + - StringUtils.formatPercent(status.mapProgress()) + + StringUtils.formatPercent(status.mapProgress(),2) + "" + desiredMaps + "" + completedMaps + "" + - StringUtils.formatPercent(status.reduceProgress()) + + StringUtils.formatPercent(status.reduceProgress(),2) + "" + desiredReduces + " " + completedReduces + "\n"); Modified: lucene/hadoop/trunk/src/webapps/job/taskdetails.jsp URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/webapps/job/taskdetails.jsp?view=diff&rev=448356&r1=448355&r2=448356 ============================================================================== --- lucene/hadoop/trunk/src/webapps/job/taskdetails.jsp (original) +++ lucene/hadoop/trunk/src/webapps/job/taskdetails.jsp Wed Sep 20 14:49:43 2006 @@ -66,7 +66,7 @@ out.print(""); writeString(out, status.getRunState()); out.print(""); - out.print(""+ StringUtils.formatPercent(status.getProgress()) + + out.print(""+ StringUtils.formatPercent(status.getProgress(),2) + ""); out.print("
");
       List failures = tracker.getTaskDiagnostics(jobid, tipid,