HADOOP-551. Revert JobClient's console printout to only include a maximum of one update per percent of progress. Contributed by Owen.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@448356 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -39,6 +39,10 @@ Trunk (unreleased changes)
 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)
 

src/java/org/apache/hadoop/mapred/JobClient.java

@@ -372,9 +372,9 @@ public class JobClient extends ToolBase implements MRConstants  {
             }
             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;

src/java/org/apache/hadoop/util/StringUtils.java

@@ -83,11 +83,19 @@ public class StringUtils {
     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);
   }
   

src/webapps/job/jobdetails.jsp

@@ -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("<tr><th><a href=\"/jobtasks.jsp?jobid=" + jobId + 
               "&type="+ kind + "&pagenum=1\">" + kind + "</a></th><td>" + 
-              StringUtils.formatPercent(completePercent) +
+              StringUtils.formatPercent(completePercent, 2) +
               "</td><td>" + totalTasks + "</td><td>" + 
               (totalTasks - runningTasks - finishedTasks) + "</td><td>" +
               runningTasks + "</td><td>" +

src/webapps/job/jobtasks.jsp

@@ -63,7 +63,7 @@
           out.print("<tr><td><a href=\"taskdetails.jsp?jobid=" + jobid + 
                     "&taskid=" + report.getTaskId() + "\">"  + 
                     report.getTaskId() + "</a></td>");
-         out.print("<td>" + StringUtils.formatPercent(report.getProgress()) + 
+         out.print("<td>" + StringUtils.formatPercent(report.getProgress(),2) + 
                    "</td>");
          out.print("<td>"  + report.getState() + "</td>");
          String[] diagnostics = report.getDiagnostics();

src/webapps/job/jobtracker.jsp

@@ -44,10 +44,10 @@
                   "<td>" + profile.getUser() + "</td>" 
                     + "<td>" + ("".equals(name) ? "&nbsp;" : name) + "</td>" + 
                     "<td>" + 
-                    StringUtils.formatPercent(status.mapProgress()) + 
+                    StringUtils.formatPercent(status.mapProgress(),2) + 
                     "</td><td>" + 
                     desiredMaps + "</td><td>" + completedMaps + "</td><td>" + 
-                    StringUtils.formatPercent(status.reduceProgress()) + 
+                    StringUtils.formatPercent(status.reduceProgress(),2) + 
                     "</td><td>" + 
                     desiredReduces + "</td><td> " + completedReduces + 
                     "</td></tr>\n");

src/webapps/job/taskdetails.jsp

@@ -66,7 +66,7 @@
       out.print("<td>");
       writeString(out, status.getRunState()); 
       out.print("</td>");
-      out.print("<td>"+ StringUtils.formatPercent(status.getProgress()) + 
+      out.print("<td>"+ StringUtils.formatPercent(status.getProgress(),2) + 
                 "</td>");
       out.print("<td><pre>");
       List<String> failures = tracker.getTaskDiagnostics(jobid, tipid,