Repository: hadoop
Updated Branches:
refs/heads/branch-2 417fbf2dc -> 7013f9d6c
YARN-4424. Fix deadlock in RMAppImpl. (Jian he via wangda)
(cherry picked from commit 7e4715186d31ac889fba26d453feedcebb11fc70)
Conflicts:
hadoop-yarn-project/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7013f9d6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7013f9d6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7013f9d6
Branch: refs/heads/branch-2
Commit: 7013f9d6cda88e72a839b1c55757615b55101beb
Parents: 417fbf2
Author: Wangda Tan <wan...@apache.org>
Authored: Tue Dec 8 14:25:16 2015 -0800
Committer: Wangda Tan <wan...@apache.org>
Committed: Tue Dec 8 14:30:01 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/7013f9d6/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 45e9934..f2d48ab 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -1983,6 +1983,8 @@ Release 2.6.3 - UNRELEASED
YARN-4365. FileSystemNodeLabelStore should check for root dir existence on
startup (Kuhu Shukla via jlowe)
+ YARN-4424. Fix deadlock in RMAppImpl. (Jian he via wangda)
+
Release 2.6.2 - 2015-10-28
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7013f9d6/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 8baddee..3a9df67 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
@@ -490,21 +490,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
