You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sh...@apache.org on 2017/12/20 20:03:13 UTC
[2/2] hadoop git commit: YARN-4167. NPE on
RMActiveServices#serviceStop when store is null. (Bibin A Chundatt via
rohithsharmaks) Backport YARN-6633 by Inigo Goiri.
YARN-4167. NPE on RMActiveServices#serviceStop when store is null. (Bibin A Chundatt via rohithsharmaks)
Backport YARN-6633 by Inigo Goiri.
(cherry picked from commit c9cb6a5960ad335a3ee93a6ee219eae5aad372f9)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/40faf492
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/40faf492
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/40faf492
Branch: refs/heads/branch-2.7
Commit: 40faf49249de228aabe16d1df4f89ef2c117544b
Parents: 5ec3335
Author: Rohith Sharma K S <ro...@apache.org>
Authored: Mon Sep 21 09:59:30 2015 +0530
Committer: Konstantin V Shvachko <sh...@apache.org>
Committed: Wed Dec 20 11:40:01 2017 -0800
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 4 ++++
.../hadoop/yarn/server/resourcemanager/ResourceManager.java | 4 +++-
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/40faf492/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 6fad3ab..b78ddd8 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -19,6 +19,10 @@ Release 2.7.6 - UNRELEASED
NodeLabelsManager.serviceInit failed. (Bibin A Chundatt via wangda)
Backport YARN-6632 by Inigo Goiri.
+ YARN-4167. NPE on RMActiveServices#serviceStop when store is null.
+ (Bibin A Chundatt via rohithsharmaks)
+ Backport YARN-6633 by Inigo Goiri.
+
Release 2.7.5 - 2017-12-14
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/40faf492/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.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/ResourceManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
index 5faaab2..1dd7120 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
@@ -592,7 +592,9 @@ public class ResourceManager extends CompositeService implements Recoverable {
if (rmContext != null) {
RMStateStore store = rmContext.getStateStore();
try {
- store.close();
+ if (null != store) {
+ store.close();
+ }
} catch (Exception e) {
LOG.error("Error closing store.", e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org