[1/2] hadoop git commit: YARN-3537. NPE when NodeManager.serviceInit fails and stopRecoveryStore invoked. Contributed by Brahma Reddy Battula (cherry picked from commit 5e093f0d400f82f67d9b2d24253c79e

2015-05-13 Thread jlowe 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 9527cdd12 - 711049981


YARN-3537. NPE when NodeManager.serviceInit fails and stopRecoveryStore 
invoked. Contributed by Brahma Reddy Battula
(cherry picked from commit 5e093f0d400f82f67d9b2d24253c79e4a5abacf9)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/71104998
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/71104998
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/71104998

Branch: refs/heads/branch-2.7
Commit: 7110499817300cb9fcfec5376ce8575028a3b6db
Parents: bfd28d6
Author: Jason Lowe jl...@apache.org
Authored: Fri Apr 24 22:02:53 2015 +
Committer: Jason Lowe jl...@apache.org
Committed: Wed May 13 20:38:52 2015 +

--
 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/71104998/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 8f2a85e..7c81cca 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -89,6 +89,9 @@ Release 2.7.1 - UNRELEASED
 YARN-3457. NPE when NodeManager.serviceInit fails and stopRecoveryStore 
called.
 (Bibin A Chundatt via ozawa)
 
+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/71104998/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 2abf62b..950031f 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
@@ -158,18 +158,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);
+  }
 }
   }
 }

[33/50] [abbrv] hadoop git commit: YARN-3537. NPE when NodeManager.serviceInit fails and stopRecoveryStore invoked. Contributed by Brahma Reddy Battula

2015-04-27 Thread zjshen 
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 +
Committer: Zhijie Shen zjs...@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);
+  }
 }
   }
 }

hadoop git commit: YARN-3537. NPE when NodeManager.serviceInit fails and stopRecoveryStore invoked. Contributed by Brahma Reddy Battula (cherry picked from commit 5e093f0d400f82f67d9b2d24253c79e4a5aba

2015-04-24 Thread jlowe 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 73ba3ebe7 - cf4154676


YARN-3537. NPE when NodeManager.serviceInit fails and stopRecoveryStore 
invoked. Contributed by Brahma Reddy Battula
(cherry picked from commit 5e093f0d400f82f67d9b2d24253c79e4a5abacf9)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cf415467
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cf415467
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cf415467

Branch: refs/heads/branch-2
Commit: cf4154676b892a36fe977c115bac52f9dabcc128
Parents: 73ba3eb
Author: Jason Lowe jl...@apache.org
Authored: Fri Apr 24 22:02:53 2015 +
Committer: Jason Lowe jl...@apache.org
Committed: Fri Apr 24 22:04:03 2015 +

--
 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/cf415467/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index ea8c723..e4bf630 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -245,6 +245,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/cf415467/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 90e903b..46d75af 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
@@ -177,18 +177,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);
+  }
 }
   }
 }

hadoop git commit: YARN-3537. NPE when NodeManager.serviceInit fails and stopRecoveryStore invoked. Contributed by Brahma Reddy Battula

2015-04-24 Thread jlowe 
Repository: hadoop
Updated Branches:
  refs/heads/trunk 5ce3a77f3 - 5e093f0d4


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/5e093f0d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5e093f0d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5e093f0d

Branch: refs/heads/trunk
Commit: 5e093f0d400f82f67d9b2d24253c79e4a5abacf9
Parents: 5ce3a77
Author: Jason Lowe jl...@apache.org
Authored: Fri Apr 24 22:02:53 2015 +
Committer: Jason Lowe jl...@apache.org
Committed: Fri Apr 24 22:02:53 2015 +

--
 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/5e093f0d/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 9754c33..001396f 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -290,6 +290,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/5e093f0d/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 4a28c6f..6718b53 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
@@ -178,18 +178,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);
+  }
 }
   }
 }