Repository: hadoop Updated Branches: refs/heads/branch-2.6.3 d47438e8b -> 0e9cef455
YARN-4424. Fix deadlock in RMAppImpl. (Jian he via wangda) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0e9cef45 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0e9cef45 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0e9cef45 Branch: refs/heads/branch-2.6.3 Commit: 0e9cef45599c59fd7010a191beecbfdcc067d84f Parents: d47438e Author: Wangda Tan <wan...@apache.org> Authored: Tue Dec 8 14:25:16 2015 -0800 Committer: Jian He <jia...@apache.org> Committed: Thu Dec 10 17:59:44 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/0e9cef45/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 73af169..f1f5ce3 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -57,6 +57,8 @@ Release 2.6.3 - 2015-12-16 YARN-4434. NodeManager Disk Checker parameter documentation is not correct. (Weiwei Yang via aajisaka) + 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/0e9cef45/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 19f2193..a6994c9 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
