Author: sharad
Date: Wed Mar 23 09:48:04 2011
New Revision: 1084525
URL: http://svn.apache.org/viewvc?rev=1084525&view=rev
Log:
Fixed a race condition in TaskAttemptImpl associated with a kill event in
ASSIGNED state. Contributed by Dick King.
Modified:
hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.java
Modified:
hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.java
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.java?rev=1084525&r1=1084524&r2=1084525&view=diff
==============================================================================
---
hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.java
(original)
+++
hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.java
Wed Mar 23 09:48:04 2011
@@ -169,9 +169,9 @@ public abstract class TaskAttemptImpl im
.addTransition(TaskAttemptState.ASSIGNED, TaskAttemptState.FAILED,
TaskAttemptEventType.TA_CONTAINER_LAUNCH_FAILED,
new DeallocateContainerTransition(TaskAttemptState.FAILED, false))
- .addTransition(TaskAttemptState.ASSIGNED, TaskAttemptState.KILLED,
- TaskAttemptEventType.TA_KILL, new DeallocateContainerTransition(
- TaskAttemptState.KILLED, false))
+ .addTransition(TaskAttemptState.ASSIGNED,
+ TaskAttemptState.KILL_CONTAINER_CLEANUP,
+ TaskAttemptEventType.TA_KILL, CLEANUP_CONTAINER_TRANSITION)
// Transitions from RUNNING state.
.addTransition(TaskAttemptState.RUNNING, TaskAttemptState.RUNNING,
@@ -272,6 +272,7 @@ public abstract class TaskAttemptImpl im
TaskAttemptEventType.TA_UPDATE,
TaskAttemptEventType.TA_DIAGNOSTICS_UPDATE,
TaskAttemptEventType.TA_COMMIT_PENDING,
+ TaskAttemptEventType.TA_CONTAINER_LAUNCHED,
TaskAttemptEventType.TA_DONE,
TaskAttemptEventType.TA_FAILMSG,
TaskAttemptEventType.TA_TIMED_OUT))
@@ -335,6 +336,7 @@ public abstract class TaskAttemptImpl im
TaskAttemptEventType.TA_CONTAINER_COMPLETED,
TaskAttemptEventType.TA_UPDATE,
TaskAttemptEventType.TA_DIAGNOSTICS_UPDATE,
+ TaskAttemptEventType.TA_CONTAINER_LAUNCHED,
TaskAttemptEventType.TA_COMMIT_PENDING,
TaskAttemptEventType.TA_DONE,
TaskAttemptEventType.TA_FAILMSG))
