svn commit: r745391 - /hadoop/core/branches/branch-0.20/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FairSchedulerServlet.java

[ma...@apache.org]

Author: matei
Date: Wed Feb 18 06:01:18 2009
New Revision: 745391

URL: http://svn.apache.org/viewvc?rev=745391&view=rev
Log:
HADOOP-4873. Display minMaps/Reduces on advanced scheduler page.

Contributed by Joydeep Sen Sarma.


Modified:
    hadoop/core/branches/branch-0.20/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FairSchedulerServlet.java

Modified: hadoop/core/branches/branch-0.20/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FairSchedulerServlet.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FairSchedulerServlet.java?rev=745391&r1=745390&r2=745391&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FairSchedulerServlet.java (original)
+++ hadoop/core/branches/branch-0.20/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FairSchedulerServlet.java Wed Feb 18 06:01:18 2009
@@ -192,7 +192,7 @@
   private void showJobs(PrintWriter out, boolean advancedView) {
     out.print("<h2>Running Jobs</h2>\n");
     out.print("<table border=\"2\" cellpadding=\"5\" cellspacing=\"2\">\n");
-    int colsPerTaskType = advancedView ? 5 : 3;
+    int colsPerTaskType = advancedView ? 6 : 3;
     out.printf("<tr><th rowspan=2>Submitted</th>" + 
         "<th rowspan=2>JobID</th>" +
         "<th rowspan=2>User</th>" +
@@ -204,9 +204,9 @@
         colsPerTaskType, colsPerTaskType);
     out.print("</tr><tr>\n");
     out.print("<th>Finished</th><th>Running</th><th>Fair Share</th>" +
-        (advancedView ? "<th>Weight</th><th>Deficit</th>" : ""));
+        (advancedView ? "<th>Weight</th><th>Deficit</th><th>minMaps</th>" : ""));
     out.print("<th>Finished</th><th>Running</th><th>Fair Share</th>" +
-        (advancedView ? "<th>Weight</th><th>Deficit</th>" : ""));
+        (advancedView ? "<th>Weight</th><th>Deficit</th><th>minReduces</th>" : ""));
     out.print("</tr>\n");
     Collection<JobInProgress> runningJobs = jobTracker.runningJobs();
     for (JobInProgress job: runningJobs) {
@@ -240,6 +240,7 @@
         out.printf("<td>%8.1f</td>\n", info.mapWeight);
         out.printf("<td>%s</td>\n", info.neededMaps > 0 ?
             (info.mapDeficit / 1000) + "s" : "--");
+        out.printf("<td>%d</td>\n", info.minMaps);
       }
       out.printf("<td>%d / %d</td><td>%d</td><td>%8.1f</td>\n",
           job.finishedReduces(), job.desiredReduces(), info.runningReduces,
@@ -248,6 +249,7 @@
         out.printf("<td>%8.1f</td>\n", info.reduceWeight);
         out.printf("<td>%s</td>\n", info.neededReduces > 0 ?
             (info.reduceDeficit / 1000) + "s" : "--");
+        out.printf("<td>%d</td>\n", info.minReduces);
       }
       out.print("</tr>\n");
     }