Repository: hadoop Updated Branches: refs/heads/branch-2.7 fb19423a3 -> 40faf4924
YARN-3425. NPE from RMNodeLabelsManager.serviceStop when NodeLabelsManager.serviceInit failed. (Bibin A Chundatt via wangda) Backport YARN-6632 by Inigo Goiri. (cherry picked from commit 492239424a3ace9868b6154f44a0f18fa5318235) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5ec33351 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5ec33351 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5ec33351 Branch: refs/heads/branch-2.7 Commit: 5ec3335104a3fab8c792289980f3a2e05cc05f8f Parents: fb19423 Author: Wangda Tan <wan...@apache.org> Authored: Wed Apr 1 10:14:48 2015 -0700 Committer: Konstantin V Shvachko <s...@apache.org> Committed: Wed Dec 20 11:29:45 2017 -0800 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 4 ++++ .../apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/5ec33351/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 1914ba7..6fad3ab 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -15,6 +15,10 @@ Release 2.7.6 - UNRELEASED YARN-7661. NodeManager metrics return wrong value after update node resource (Yang Wang via jlowe) + YARN-3425. NPE from RMNodeLabelsManager.serviceStop when + NodeLabelsManager.serviceInit failed. (Bibin A Chundatt via wangda) + Backport YARN-6632 by Inigo Goiri. + Release 2.7.5 - 2017-12-14 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/5ec33351/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java index b9031d6..4925976 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java @@ -248,7 +248,9 @@ public class CommonNodeLabelsManager extends AbstractService { // for UT purpose protected void stopDispatcher() { AsyncDispatcher asyncDispatcher = (AsyncDispatcher) dispatcher; - asyncDispatcher.stop(); + if (null != asyncDispatcher) { + asyncDispatcher.stop(); + } } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
