MAPREDUCE-2667. mapred job -kill leaves application in RUNNING state (thomas graves via mahadev)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-279@1150540 13f79535-47bb-0310-9956-ffa450edef68

mapreduce/CHANGES.txt

@@ -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)
 

mapreduce/yarn/yarn-server/yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/ApplicationImpl.java

@@ -174,9 +174,9 @@ public class ApplicationImpl implements Application,
       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,