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

YARN-4424. Fix deadlock in RMAppImpl. (Jian he via wangda) 

(cherry picked from commit 7e4715186d)

Conflicts:
	hadoop-yarn-project/CHANGES.txt

(cherry picked from commit 7013f9d6cd)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
This commit is contained in:
Wangda Tan 2015-12-08 14:25:16 -08:00
parent c4ae007fd4
commit a4ba6c8525
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2000,6 +2000,8 @@ Release 2.6.3 - UNRELEASED
YARN-4434. NodeManager Disk Checker parameter documentation is not correct. YARN-4434. NodeManager Disk Checker parameter documentation is not correct.
(Weiwei Yang via aajisaka) (Weiwei Yang via aajisaka)
YARN-4424. Fix deadlock in RMAppImpl. (Jian he via wangda)
Release 2.6.2 - 2015-10-28 Release 2.6.2 - 2015-10-28
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

22
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

@ -490,21 +490,15 @@ public class RMAppImpl implements RMApp, Recoverable {
@Override @Override
public FinalApplicationStatus getFinalApplicationStatus() { public FinalApplicationStatus getFinalApplicationStatus() {
this.readLock.lock(); // finish state is obtained based on the state machine's current state
try { // as a fall-back in case the application has not been unregistered
// finish state is obtained based on the state machine's current state // ( or if the app never unregistered itself )
// as a fall-back in case the application has not been unregistered // when the report is requested
// ( or if the app never unregistered itself ) if (currentAttempt != null
// when the report is requested && currentAttempt.getFinalApplicationStatus() != null) {
if (currentAttempt != null return currentAttempt.getFinalApplicationStatus();
&& currentAttempt.getFinalApplicationStatus() != null) {
return currentAttempt.getFinalApplicationStatus();
}
return
createFinalApplicationStatus(this.stateMachine.getCurrentState());
} finally {
this.readLock.unlock();
} }
return createFinalApplicationStatus(this.stateMachine.getCurrentState());
} }
@Override @Override