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 ww...@apache.org on 2019/06/03 06:26:38 UTC
[hadoop] branch branch-3.1 updated: YARN-9507. Fix NPE in
NodeManager#serviceStop on startup failure. Contributed by Bilwa S T.
This is an automated email from the ASF dual-hosted git repository.
wwei pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 23f9508 YARN-9507. Fix NPE in NodeManager#serviceStop on startup failure. Contributed by Bilwa S T.
23f9508 is described below
commit 23f9508a898d7e2cbaddf694706415a402f415eb
Author: Weiwei Yang <ww...@apache.org>
AuthorDate: Mon Jun 3 14:09:37 2019 +0800
YARN-9507. Fix NPE in NodeManager#serviceStop on startup failure. Contributed by Bilwa S T.
(cherry picked from commit 4530f4500d308c9cefbcc5990769c04bd061ad87)
---
.../org/apache/hadoop/yarn/server/nodemanager/NodeManager.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
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 b54a6b7..cd4171a 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
@@ -488,9 +488,11 @@ public class NodeManager extends CompositeService
DefaultMetricsSystem.shutdown();
// Cleanup ResourcePluginManager
- ResourcePluginManager rpm = context.getResourcePluginManager();
- if (rpm != null) {
- rpm.cleanup();
+ if (null != context) {
+ ResourcePluginManager rpm = context.getResourcePluginManager();
+ if (rpm != null) {
+ rpm.cleanup();
+ }
}
} finally {
// YARN-3641: NM's services stop get failed shouldn't block the
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org