浏览代码

YARN-9507. Fix NPE in NodeManager#serviceStop on startup failure. Contributed by Bilwa S T.

Weiwei Yang 6 年之前
父节点
当前提交
4530f4500d

+ 5 - 3
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java

@@ -526,9 +526,11 @@ public class NodeManager extends CompositeService
       DefaultMetricsSystem.shutdown();
       DefaultMetricsSystem.shutdown();
 
 
       // Cleanup ResourcePluginManager
       // Cleanup ResourcePluginManager
-      ResourcePluginManager rpm = context.getResourcePluginManager();
-      if (rpm != null) {
-        rpm.cleanup();
+      if (null != context) {
+        ResourcePluginManager rpm = context.getResourcePluginManager();
+        if (rpm != null) {
+          rpm.cleanup();
+        }
       }
       }
     } finally {
     } finally {
       // YARN-3641: NM's services stop get failed shouldn't block the
       // YARN-3641: NM's services stop get failed shouldn't block the