YARN-4421. Remove dead code in RmAppImpl.RMAppRecoveredTransition. (Daniel Templeton via rohithsharmaks)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a5e2e1ec Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a5e2e1ec Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a5e2e1ec Branch: refs/heads/yarn-2877 Commit: a5e2e1ecb06a3942903cb79f61f0f4bb02480f19 Parents: 15c3e7f Author: rohithsharmaks <rohithsharm...@apache.org> Authored: Wed Dec 9 11:31:51 2015 +0530 Committer: rohithsharmaks <rohithsharm...@apache.org> Committed: Wed Dec 9 11:31:51 2015 +0530 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../yarn/server/resourcemanager/rmapp/RMAppImpl.java | 10 ---------- 2 files changed, 3 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a5e2e1ec/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 3935cde..2e0514b 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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/a5e2e1ec/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java ---------------------------------------------------------------------- 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 3a9df67..7a2b717 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.