Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7A00818DF5 for ; Wed, 9 Dec 2015 06:04:37 +0000 (UTC) Received: (qmail 35858 invoked by uid 500); 9 Dec 2015 06:04:37 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 35789 invoked by uid 500); 9 Dec 2015 06:04:37 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 35780 invoked by uid 99); 9 Dec 2015 06:04:37 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Dec 2015 06:04:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D1F5FE0B11; Wed, 9 Dec 2015 06:04:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rohithsharmaks@apache.org To: common-commits@hadoop.apache.org Message-Id: <8b9f36da1ed044f68d44c72723a045bc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-4421. Remove dead code in RmAppImpl.RMAppRecoveredTransition. (Daniel Templeton via rohithsharmaks) Date: Wed, 9 Dec 2015 06:04:36 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-2 f626d18cc -> 81f8a2b00 YARN-4421. Remove dead code in RmAppImpl.RMAppRecoveredTransition. (Daniel Templeton via rohithsharmaks) (cherry picked from commit a5e2e1ecb06a3942903cb79f61f0f4bb02480f19) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/81f8a2b0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/81f8a2b0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/81f8a2b0 Branch: refs/heads/branch-2 Commit: 81f8a2b0084fcb31aac0dabe47dd9f89c11a46bb Parents: f626d18 Author: rohithsharmaks Authored: Wed Dec 9 11:31:51 2015 +0530 Committer: rohithsharmaks Committed: Wed Dec 9 11:33:49 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/81f8a2b0/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 5d0d2a1..8048e50 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -1059,6 +1059,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/81f8a2b0/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.