Browse Source

Merge -r 702372:702373 from trunk onto 0.19 branch. Fixes HADOOP-4256.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.19@702374 13f79535-47bb-0310-9956-ffa450edef68
Devaraj Das 16 years ago
parent
commit
fde22889bf

+ 3 - 0
CHANGES.txt

@@ -810,6 +810,9 @@ Release 0.19.0 - Unreleased
     to job failure). Only after the init has successfully happened do we 
     to job failure). Only after the init has successfully happened do we 
     launch the setupJob task. (Amareshwari Sriramadasu via ddas)
     launch the setupJob task. (Amareshwari Sriramadasu via ddas)
 
 
+    HADOOP-4256. Removes Completed and Failed Job tables from 
+    jobqueue_details.jsp. (Sreekanth Ramakrishnan via ddas)
+
 Release 0.18.2 - Unreleased
 Release 0.18.2 - Unreleased
 
 
   BUG FIXES
   BUG FIXES

+ 2 - 2
src/mapred/org/apache/hadoop/mapred/JSPUtil.java

@@ -19,7 +19,7 @@ package org.apache.hadoop.mapred;
 
 
 import java.io.IOException;
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.Iterator;
-import java.util.Vector;
+import java.util.Collection;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
@@ -80,7 +80,7 @@ class JSPUtil {
    * @return
    * @return
    * @throws IOException
    * @throws IOException
    */
    */
-  public static String generateJobTable(String label, Vector<JobInProgress> jobs
+  public static String generateJobTable(String label, Collection<JobInProgress> jobs
       , int refresh, int rowId) throws IOException {
       , int refresh, int rowId) throws IOException {
 
 
     boolean isModifiable = label.equals("Running") 
     boolean isModifiable = label.equals("Running") 

+ 7 - 57
src/webapps/job/jobqueue_details.jsp

@@ -18,37 +18,8 @@ private static final long serialVersionUID = 526456771152222127L;
     StringUtils.simpleHostname(tracker.getJobTrackerMachine());
     StringUtils.simpleHostname(tracker.getJobTrackerMachine());
   String queueName = 
   String queueName = 
     StringUtils.escapeHTML(request.getParameter("queueName"));
     StringUtils.escapeHTML(request.getParameter("queueName"));
-  Vector<JobInProgress> completedJobs = new Vector<JobInProgress>();
-  Vector<JobInProgress> failedJobs = new Vector<JobInProgress>();
-  Vector<JobInProgress> runningJobs = new Vector<JobInProgress>();
-  Vector<JobInProgress> waitingJobs = new Vector<JobInProgress>();
-  Collection<JobInProgress> jobs = null;
   TaskScheduler scheduler = tracker.getTaskScheduler();
   TaskScheduler scheduler = tracker.getTaskScheduler();
-  
-  
-  
-  if((queueName != null) && !(queueName.trim().equals(""))) {
-    jobs = scheduler.getJobs(queueName);
-  }
-  
-  if(jobs!=null && !jobs.isEmpty()) {
-    for(JobInProgress job :jobs) {
-      switch(job.getStatus().getRunState()){
-      case JobStatus.RUNNING:
-        runningJobs.add(job);
-        break;
-      case JobStatus.PREP:
-        waitingJobs.add(job);
-        break;
-      case JobStatus.SUCCEEDED:
-        completedJobs.add(job);
-        break;
-      case JobStatus.FAILED:
-        failedJobs.add(job);
-        break;
-      }
-    }
-  }
+  Collection<JobInProgress> jobs = scheduler.getJobs(queueName);
   JobQueueInfo schedInfo = tracker.getQueueInfo(queueName);
   JobQueueInfo schedInfo = tracker.getQueueInfo(queueName);
 %>
 %>
 <html>
 <html>
@@ -81,37 +52,16 @@ if(jobs == null || jobs.isEmpty()) {
 %>
 %>
 <center>
 <center>
 <h2> Job Summary for the Queue :: <%=queueName!=null?queueName:"" %> </h2>
 <h2> Job Summary for the Queue :: <%=queueName!=null?queueName:"" %> </h2>
-<hr/>
 </center>
 </center>
-<h2>Running Jobs</h2>
-<%=
-  JSPUtil.generateJobTable("Running", runningJobs, 30, 0)
-%>
-<hr>
-
-<h2>Waiting Jobs</h2>
-<%=
-  JSPUtil.generateJobTable("Waiting", waitingJobs, 30, runningJobs.size())
-%>
-<hr>
-
-<h2>Completed Jobs</h2>
-<%=
-  JSPUtil.generateJobTable("Completed", completedJobs, 0,
-      (runningJobs.size()+waitingJobs.size()))
-%>
-
-<hr>
-
-<h2>Failed Jobs</h2>
+<div style="text-align: center;text-indent: center;font-style: italic;">
+(In the order maintained by the scheduler)
+</div>
+<br/>
+<hr/>
 <%=
 <%=
-  JSPUtil.generateJobTable("Failed", failedJobs, 0,
-      (runningJobs.size()+waitingJobs.size()+completedJobs.size()))
+  JSPUtil.generateJobTable("Job List", jobs, 30, 0)
 %>
 %>
-
 <hr>
 <hr>
-
-
 <% } %>
 <% } %>
 
 
 <%
 <%