Author: mahadev
Date: Mon Jul 25 04:30:24 2011
New Revision: 1150540
URL: http://svn.apache.org/viewvc?rev=1150540&view=rev
Log:
MAPREDUCE-2667. mapred job -kill leaves application in RUNNING state (thomas
graves via mahadev)
Modified:
hadoop/common/branches/MR-279/mapreduce/CHANGES.txt
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/ApplicationImpl.java
Modified: hadoop/common/branches/MR-279/mapreduce/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/CHANGES.txt?rev=1150540&r1=1150539&r2=1150540&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/CHANGES.txt (original)
+++ hadoop/common/branches/MR-279/mapreduce/CHANGES.txt Mon Jul 25 04:30:24 2011
@@ -4,6 +4,9 @@ Trunk (unreleased changes)
MAPREDUCE-279
+
+ MAPREDUCE-2667. mapred job -kill leaves application in RUNNING state
+ (thomas graves via mahadev)
HADOOP-6929. Making Security Info abstract and not an interface (mahadev)
Modified:
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/ApplicationImpl.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/ApplicationImpl.java?rev=1150540&r1=1150539&r2=1150540&view=diff
==============================================================================
---
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/ApplicationImpl.java
(original)
+++
hadoop/common/branches/MR-279/mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/ApplicationImpl.java
Mon Jul 25 04:30:24 2011
@@ -174,9 +174,9 @@ public class ApplicationImpl implements
ApplicationState.EXPIRED_PENDING, ApplicationEventType.EXPIRE,
expireTransition)
.addTransition(ApplicationState.RUNNING,
- EnumSet.of(ApplicationState.COMPLETED, ApplicationState.FAILED),
+ EnumSet.of(ApplicationState.COMPLETED, ApplicationState.FAILED,
+ ApplicationState.KILLED),
ApplicationEventType.FINISH, new DoneTransition())
- // TODO: For now, no KILLED above. As all kills come to RM directly.
.addTransition(ApplicationState.RUNNING, ApplicationState.RUNNING,
ApplicationEventType.STATUSUPDATE, statusUpdatetransition)
.addTransition(ApplicationState.RUNNING, ApplicationState.KILLED,
