Author: ddas
Date: Wed Jan 7 21:54:09 2009
New Revision: 732616
URL: http://svn.apache.org/viewvc?rev=732616&view=rev
Log:
Merge -r 732613:732614 from trunk onto 0.20 branch. Fixes HADOOP-4966.
Modified:
hadoop/core/branches/branch-0.20/CHANGES.txt
hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobTracker.java
Modified: hadoop/core/branches/branch-0.20/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=732616&r1=732615&r2=732616&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.20/CHANGES.txt Wed Jan 7 21:54:09 2009
@@ -544,6 +544,9 @@
HADOOP-4847. Moves the loading of OutputCommitter to the Task.
(Amareshwari Sriramadasu via ddas)
+ HADOOP-4966. Marks completed setup tasks for removal.
+ (Amareshwari Sriramadasu via ddas)
+
Release 0.19.0 - 2008-11-18
INCOMPATIBLE CHANGES
Modified:
hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobTracker.java
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobTracker.java?rev=732616&r1=732615&r2=732616&view=diff
==============================================================================
---
hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobTracker.java
(original)
+++
hadoop/core/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobTracker.java
Wed Jan 7 21:54:09 2009
@@ -1722,6 +1722,16 @@
* @param job the completed job
*/
void markCompletedJob(JobInProgress job) {
+ for (TaskInProgress tip : job.getSetupTasks()) {
+ for (TaskStatus taskStatus : tip.getTaskStatuses()) {
+ if (taskStatus.getRunState() != TaskStatus.State.RUNNING &&
+ taskStatus.getRunState() != TaskStatus.State.COMMIT_PENDING &&
+ taskStatus.getRunState() != TaskStatus.State.UNASSIGNED) {
+ markCompletedTaskAttempt(taskStatus.getTaskTracker(),
+ taskStatus.getTaskID());
+ }
+ }
+ }
for (TaskInProgress tip : job.getMapTasks()) {
for (TaskStatus taskStatus : tip.getTaskStatuses()) {
if (taskStatus.getRunState() != TaskStatus.State.RUNNING &&
