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 jl...@apache.org on 2015/05/13 23:07:20 UTC
hadoop git commit: YARN-3641. NodeManager: stopRecoveryStore()
shouldn't be skipped when exceptions happen in stopping NM's sub-services.
Contributed by Junping Du
Repository: hadoop
Updated Branches:
refs/heads/trunk f7de6198d -> 711d77cc5
YARN-3641. NodeManager: stopRecoveryStore() shouldn't be skipped when exceptions happen in stopping NM's sub-services. Contributed by Junping Du
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/711d77cc
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/711d77cc
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/711d77cc
Branch: refs/heads/trunk
Commit: 711d77cc54a64b2c3db70bdacc6bf2245c896a4b
Parents: f7de619
Author: Jason Lowe <jl...@apache.org>
Authored: Wed May 13 21:06:47 2015 +0000
Committer: Jason Lowe <jl...@apache.org>
Committed: Wed May 13 21:06:47 2015 +0000
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../hadoop/yarn/server/nodemanager/NodeManager.java | 11 ++++++++---
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/711d77cc/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 146690b..af8d26f 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -488,6 +488,9 @@ Release 2.7.1 - UNRELEASED
YARN-3537. NPE when NodeManager.serviceInit fails and stopRecoveryStore
invoked (Brahma Reddy Battula via jlowe)
+ YARN-3641. NodeManager: stopRecoveryStore() shouldn't be skipped when
+ exceptions happen in stopping NM's sub-services. (Junping Du via jlowe)
+
Release 2.7.0 - 2015-04-20
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/711d77cc/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 4ac06d0..03e17c8 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
@@ -326,9 +326,14 @@ public class NodeManager extends CompositeService
if (isStopping.getAndSet(true)) {
return;
}
- super.serviceStop();
- stopRecoveryStore();
- DefaultMetricsSystem.shutdown();
+ try {
+ super.serviceStop();
+ DefaultMetricsSystem.shutdown();
+ } finally {
+ // YARN-3641: NM's services stop get failed shouldn't block the
+ // release of NMLevelDBStore.
+ stopRecoveryStore();
+ }
}
public String getName() {