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 zj...@apache.org on 2015/04/27 23:26:36 UTC
[33/50] [abbrv] hadoop git commit: YARN-3537. NPE when
NodeManager.serviceInit fails and stopRecoveryStore invoked. Contributed by
Brahma Reddy Battula
YARN-3537. NPE when NodeManager.serviceInit fails and stopRecoveryStore invoked. Contributed by Brahma Reddy Battula
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6117a701
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6117a701
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6117a701
Branch: refs/heads/YARN-2928
Commit: 6117a701a1e8f47936c7429ecacd58b1db60d801
Parents: 0331b4d
Author: Jason Lowe <jl...@apache.org>
Authored: Fri Apr 24 22:02:53 2015 +0000
Committer: Zhijie Shen <zj...@apache.org>
Committed: Mon Apr 27 14:18:51 2015 -0700
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../yarn/server/nodemanager/NodeManager.java | 26 +++++++++++---------
2 files changed, 17 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6117a701/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index fa26329..aafb74f 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -354,6 +354,9 @@ Release 2.7.1 - UNRELEASED
YARN-3522. Fixed DistributedShell to instantiate TimeLineClient as the
correct user. (Zhijie Shen via jianhe)
+ YARN-3537. NPE when NodeManager.serviceInit fails and stopRecoveryStore
+ invoked (Brahma Reddy Battula via jlowe)
+
Release 2.7.0 - 2015-04-20
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6117a701/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java
index 6f71004..609975b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java
@@ -185,18 +185,20 @@ public class NodeManager extends CompositeService
}
private void stopRecoveryStore() throws IOException {
- nmStore.stop();
- if (null != context) {
- if (context.getDecommissioned() && nmStore.canRecover()) {
- LOG.info("Removing state store due to decommission");
- Configuration conf = getConfig();
- Path recoveryRoot =
- new Path(conf.get(YarnConfiguration.NM_RECOVERY_DIR));
- LOG.info("Removing state store at " + recoveryRoot
- + " due to decommission");
- FileSystem recoveryFs = FileSystem.getLocal(conf);
- if (!recoveryFs.delete(recoveryRoot, true)) {
- LOG.warn("Unable to delete " + recoveryRoot);
+ if (null != nmStore) {
+ nmStore.stop();
+ if (null != context) {
+ if (context.getDecommissioned() && nmStore.canRecover()) {
+ LOG.info("Removing state store due to decommission");
+ Configuration conf = getConfig();
+ Path recoveryRoot =
+ new Path(conf.get(YarnConfiguration.NM_RECOVERY_DIR));
+ LOG.info("Removing state store at " + recoveryRoot
+ + " due to decommission");
+ FileSystem recoveryFs = FileSystem.getLocal(conf);
+ if (!recoveryFs.delete(recoveryRoot, true)) {
+ LOG.warn("Unable to delete " + recoveryRoot);
+ }
}
}
}