Author: tgraves Date: Wed Feb 6 19:16:20 2013 New Revision: 1443143 URL: http://svn.apache.org/viewvc?rev=1443143&view=rev Log: YARN-150. AppRejectedTransition does not unregister app from master service and scheduler (Bikas Shah via tgraves)
Modified: hadoop/common/branches/branch-0.23/hadoop-yarn-project/CHANGES.txt hadoop/common/branches/branch-0.23/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java hadoop/common/branches/branch-0.23/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java Modified: hadoop/common/branches/branch-0.23/hadoop-yarn-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-yarn-project/CHANGES.txt?rev=1443143&r1=1443142&r2=1443143&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-yarn-project/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.23/hadoop-yarn-project/CHANGES.txt Wed Feb 6 19:16:20 2013 @@ -35,6 +35,9 @@ Release 0.23.7 - UNRELEASED YARN-355. Fixes a bug where RM app submission could jam under load. (Daryn Sharp via sseth) + YARN-150. AppRejectedTransition does not unregister app from master service + and scheduler (Bikas Shah via tgraves) + Release 0.23.6 - UNRELEASED INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-0.23/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java?rev=1443143&r1=1443142&r2=1443143&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java Wed Feb 6 19:16:20 2013 @@ -572,6 +572,10 @@ public class RMAppAttemptImpl implements RMAppAttemptRejectedEvent rejectedEvent = (RMAppAttemptRejectedEvent) event; + // Tell the AMS. Unregister from the ApplicationMasterService + appAttempt.masterService + .unregisterAttempt(appAttempt.applicationAttemptId); + // Save the diagnostic message String message = rejectedEvent.getMessage(); appAttempt.setDiagnostics(message); Modified: hadoop/common/branches/branch-0.23/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java?rev=1443143&r1=1443142&r2=1443143&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java Wed Feb 6 19:16:20 2013 @@ -264,6 +264,9 @@ public class TestRMAppAttemptTransitions assertNull(applicationAttempt.getFinalApplicationStatus()); // Check events + verify(masterService). + unregisterAttempt(applicationAttempt.getAppAttemptId()); + verify(application).handle(any(RMAppRejectedEvent.class)); } @@ -443,7 +446,6 @@ public class TestRMAppAttemptTransitions testAppAttemptRunningState(container, host, rpcPort, trackingUrl); } - @Test public void testNewToKilled() { applicationAttempt.handle(