You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by dd...@apache.org on 2008/10/07 09:53:22 UTC
svn commit: r702374 - in /hadoop/core/branches/branch-0.19: CHANGES.txt
src/mapred/org/apache/hadoop/mapred/JSPUtil.java
src/webapps/job/jobqueue_details.jsp
Author: ddas
Date: Tue Oct 7 00:53:22 2008
New Revision: 702374
URL: http://svn.apache.org/viewvc?rev=702374&view=rev
Log:
Merge -r 702372:702373 from trunk onto 0.19 branch. Fixes HADOOP-4256.
Modified:
hadoop/core/branches/branch-0.19/CHANGES.txt
hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JSPUtil.java
hadoop/core/branches/branch-0.19/src/webapps/job/jobqueue_details.jsp
Modified: hadoop/core/branches/branch-0.19/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/CHANGES.txt?rev=702374&r1=702373&r2=702374&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.19/CHANGES.txt Tue Oct 7 00:53:22 2008
@@ -810,6 +810,9 @@
to job failure). Only after the init has successfully happened do we
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
BUG FIXES
Modified: hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JSPUtil.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JSPUtil.java?rev=702374&r1=702373&r2=702374&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JSPUtil.java (original)
+++ hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JSPUtil.java Tue Oct 7 00:53:22 2008
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.util.Iterator;
-import java.util.Vector;
+import java.util.Collection;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -80,7 +80,7 @@
* @return
* @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 {
boolean isModifiable = label.equals("Running")
Modified: hadoop/core/branches/branch-0.19/src/webapps/job/jobqueue_details.jsp
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/webapps/job/jobqueue_details.jsp?rev=702374&r1=702373&r2=702374&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/webapps/job/jobqueue_details.jsp (original)
+++ hadoop/core/branches/branch-0.19/src/webapps/job/jobqueue_details.jsp Tue Oct 7 00:53:22 2008
@@ -18,37 +18,8 @@
StringUtils.simpleHostname(tracker.getJobTrackerMachine());
String 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();
-
-
-
- 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);
%>
<html>
@@ -81,37 +52,16 @@
%>
<center>
<h2> Job Summary for the Queue :: <%=queueName!=null?queueName:"" %> </h2>
-<hr/>
</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>
-
-
<% } %>
<%