diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 3935cde1e90..2e0514b9e78 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -1111,6 +1111,9 @@ Release 2.8.0 - UNRELEASED YARN-4431. Not necessary to do unRegisterNM() if NM get stop due to failed to connect to RM. (Junping Du via rohithsharmaks) + YARN-4421. Remove dead code in RmAppImpl.RMAppRecoveredTransition. + (Daniel Templeton via rohithsharmaks) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java index 3a9df67a7a0..7a2b717cc73 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java @@ -977,16 +977,6 @@ public class RMAppImpl implements RMApp, Recoverable { // recover attempts app.recoverAppAttempts(); - // Last attempt is in final state, return ACCEPTED waiting for last - // RMAppAttempt to send finished or failed event back. - if (app.currentAttempt != null - && (app.currentAttempt.getState() == RMAppAttemptState.KILLED - || app.currentAttempt.getState() == RMAppAttemptState.FINISHED - || (app.currentAttempt.getState() == RMAppAttemptState.FAILED - && app.getNumFailedAppAttempts() == app.maxAppAttempts))) { - return RMAppState.ACCEPTED; - } - // YARN-1507 is saving the application state after the application is // accepted. So after YARN-1507, an app is saved meaning it is accepted. // Thus we return ACCECPTED state on recovery.