Author: omalley
Date: Fri Mar 4 05:23:55 2011
New Revision: 1077803
URL: http://svn.apache.org/viewvc?rev=1077803&view=rev
Log:
commit ee0e481fb74310b6ed2d62bb0377970a09abb371
Author: Luke Lu <[email protected]>
Date: Fri Feb 11 11:36:00 2011 -0800
Fix a task state corrupting race
+++ b/YAHOO-CHANGES.txt
+ Fix a task state corrupting race. (llu)
+
Modified:
hadoop/common/branches/branch-0.20-security-203/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
Modified:
hadoop/common/branches/branch-0.20-security-203/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-203/src/mapred/org/apache/hadoop/mapred/TaskTracker.java?rev=1077803&r1=1077802&r2=1077803&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security-203/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
(original)
+++
hadoop/common/branches/branch-0.20-security-203/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
Fri Mar 4 05:23:55 2011
@@ -2419,12 +2419,13 @@ public class TaskTracker implements MRCo
((this.taskStatus.getRunState() == TaskStatus.State.COMMIT_PENDING ||
this.taskStatus.getRunState() == TaskStatus.State.FAILED_UNCLEAN ||
this.taskStatus.getRunState() == TaskStatus.State.KILLED_UNCLEAN) &&
- taskStatus.getRunState() == TaskStatus.State.RUNNING)) {
+ (taskStatus.getRunState() == TaskStatus.State.RUNNING ||
+ taskStatus.getRunState() == TaskStatus.State.UNASSIGNED))) {
//make sure we ignore progress messages after a task has
//invoked TaskUmbilicalProtocol.done() or if the task has been
//KILLED/FAILED/FAILED_UNCLEAN/KILLED_UNCLEAN
//Also ignore progress update if the state change is from
- //COMMIT_PENDING/FAILED_UNCLEAN/KILLED_UNCLEA to RUNNING
+ //COMMIT_PENDING/FAILED_UNCLEAN/KILLED_UNCLEA to RUNNING or UNASSIGNED
LOG.info(task.getTaskID() + " Ignoring status-update since " +
((this.done) ? "task is 'done'" :
("runState: " + this.taskStatus.getRunState()))
