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 8358718351 for ; Wed, 23 Dec 2015 20:49:02 +0000 (UTC) Received: (qmail 63573 invoked by uid 500); 23 Dec 2015 20:49:02 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 63496 invoked by uid 500); 23 Dec 2015 20:49:02 -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 63487 invoked by uid 99); 23 Dec 2015 20:49:02 -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, 23 Dec 2015 20:49:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 10CD7E002C; Wed, 23 Dec 2015 20:49:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vinodkv@apache.org To: common-commits@hadoop.apache.org Message-Id: <0e7cd3e41df14a7fa3308a5b52c46a7e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-4424. Fix deadlock in RMAppImpl. (Jian he via wangda) Date: Wed, 23 Dec 2015 20:49:02 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-2.7.2 e6de3a1ca -> 83d1df9ee YARN-4424. Fix deadlock in RMAppImpl. (Jian he via wangda) (cherry picked from commit 0e9cef45599c59fd7010a191beecbfdcc067d84f) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/83d1df9e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/83d1df9e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/83d1df9e Branch: refs/heads/branch-2.7.2 Commit: 83d1df9ee6d246f789097a476d1c027515401307 Parents: e6de3a1 Author: Wangda Tan Authored: Tue Dec 8 14:25:16 2015 -0800 Committer: Vinod Kumar Vavilapalli (I am also known as @tshooter.) Committed: Wed Dec 23 12:42:19 2015 -0800 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 2 ++ .../server/resourcemanager/rmapp/RMAppImpl.java | 22 +++++++------------- 2 files changed, 10 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/83d1df9e/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index b04a4d7..cfd2c96 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -874,6 +874,8 @@ Release 2.6.3 - UNRELEASED BUG FIXES + YARN-4424. Fix deadlock in RMAppImpl. (jianhe via wtan) + Release 2.6.2 - 2015-10-28 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/83d1df9e/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 a6fc58b..fe81f5b 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 @@ -427,21 +427,15 @@ public class RMAppImpl implements RMApp, Recoverable { @Override public FinalApplicationStatus getFinalApplicationStatus() { - this.readLock.lock(); - try { - // finish state is obtained based on the state machine's current state - // as a fall-back in case the application has not been unregistered - // ( or if the app never unregistered itself ) - // when the report is requested - if (currentAttempt != null - && currentAttempt.getFinalApplicationStatus() != null) { - return currentAttempt.getFinalApplicationStatus(); - } - return - createFinalApplicationStatus(this.stateMachine.getCurrentState()); - } finally { - this.readLock.unlock(); + // finish state is obtained based on the state machine's current state + // as a fall-back in case the application has not been unregistered + // ( or if the app never unregistered itself ) + // when the report is requested + if (currentAttempt != null + && currentAttempt.getFinalApplicationStatus() != null) { + return currentAttempt.getFinalApplicationStatus(); } + return createFinalApplicationStatus(this.stateMachine.getCurrentState()); } @Override