Author: cdouglas
Date: Thu Mar 26 23:41:48 2009
New Revision: 758925
URL: http://svn.apache.org/viewvc?rev=758925&view=rev
Log:
HADOOP-5322. Fix misleading/outdated comments in JobInProgress. Contributed by
Amareshwari Sriramadasu
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
Modified: hadoop/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=758925&r1=758924&r2=758925&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Thu Mar 26 23:41:48 2009
@@ -339,6 +339,9 @@
HADOOP-5194. Disables setsid for tasks run on cygwin.
(Ravi Gummadi via ddas)
+ HADOOP-5322. Fix misleading/outdated comments in JobInProgress.
+ (Amareshwari Sriramadasu via cdouglas)
+
Release 0.20.0 - Unreleased
INCOMPATIBLE CHANGES
Modified:
hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/JobInProgress.java?rev=758925&r1=758924&r2=758925&view=diff
==============================================================================
--- hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
(original)
+++ hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
Thu Mar 26 23:41:48 2009
@@ -859,7 +859,7 @@
// It _is_ safe to add the TaskCompletionEvent.Status.SUCCEEDED
// *before* calling TIP.completedTask since:
// a. One and only one task of a TIP is declared as a SUCCESS, the
- // other (speculative tasks) are marked KILLED by the TaskCommitThread
+ // other (speculative tasks) are marked KILLED
// b. TIP.completedTask *does not* throw _any_ exception at all.
if (taskEvent != null) {
this.taskCompletionEvents.add(taskEvent);
@@ -1970,11 +1970,8 @@
final JobTrackerInstrumentation metrics = jobtracker.getInstrumentation();
// Sanity check: is the TIP already complete?
- // It _is_ safe to not decrement running{Map|Reduce}Tasks and
- // finished{Map|Reduce}Tasks variables here because one and only
- // one task-attempt of a TIP gets to completedTask. This is because
- // the TaskCommitThread in the JobTracker marks other, completed,
- // speculative tasks as _complete_.
+ // This would not happen,
+ // because no two tasks are SUCCEEDED at the same time.
if (tip.isComplete()) {
// Mark this task as KILLED
tip.alreadyCompletedTask(taskid);
