Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
rohithsharmaks 2015-12-09 11:31:51 +05:30
parent 15c3e7ffe3
commit a5e2e1ecb0
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -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 YARN-4431. Not necessary to do unRegisterNM() if NM get stop due to failed to connect
to RM. (Junping Du via rohithsharmaks) to RM. (Junping Du via rohithsharmaks)
YARN-4421. Remove dead code in RmAppImpl.RMAppRecoveredTransition.
(Daniel Templeton via rohithsharmaks)
Release 2.7.3 - UNRELEASED Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

10
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java
View File

@ -977,16 +977,6 @@ public class RMAppImpl implements RMApp, Recoverable {
// recover attempts // recover attempts
app.recoverAppAttempts(); 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 // YARN-1507 is saving the application state after the application is
// accepted. So after YARN-1507, an app is saved meaning it is accepted. // accepted. So after YARN-1507, an app is saved meaning it is accepted.
// Thus we return ACCECPTED state on recovery. // Thus we return ACCECPTED state on recovery.