YARN-4421. Remove dead code in RmAppImpl.RMAppRecoveredTransition. (Daniel Templeton via rohithsharmaks)

(cherry picked from commit a5e2e1ecb0)
This commit is contained in:
rohithsharmaks 2015-12-09 11:31:51 +05:30
parent 6a6bbc51c4
commit 5bc33c5ae4
2 changed files with 3 additions and 10 deletions

View File

@ -1034,6 +1034,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

View File

@ -983,16 +983,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.