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

YARN-3425. NPE from RMNodeLabelsManager.serviceStop when NodeLabelsManager.serviceInit failed. (Bibin A Chundatt via wangda) 

(cherry picked from commit 492239424a)
This commit is contained in:
Wangda Tan 2015-04-01 10:14:48 -07:00
parent 5e4d457674
commit 865be70b02
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,6 +81,9 @@ Release 2.8.0 - UNRELEASED
YARN-3412. RM tests should use MockRM where possible. (kasha) YARN-3412. RM tests should use MockRM where possible. (kasha)
YARN-3425. NPE from RMNodeLabelsManager.serviceStop when
NodeLabelsManager.serviceInit failed. (Bibin A Chundatt via wangda)
Release 2.7.0 - UNRELEASED Release 2.7.0 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java
View File

@ -258,8 +258,10 @@ public class CommonNodeLabelsManager extends AbstractService {
// for UT purpose // for UT purpose
protected void stopDispatcher() { protected void stopDispatcher() {
AsyncDispatcher asyncDispatcher = (AsyncDispatcher) dispatcher; AsyncDispatcher asyncDispatcher = (AsyncDispatcher) dispatcher;
if (null != asyncDispatcher) {
asyncDispatcher.stop(); asyncDispatcher.stop();
} }
}
@Override @Override
protected void serviceStop() throws Exception { protected void serviceStop() throws Exception {