Skip to content

Commit 4530f45

Browse files
committed
YARN-9507. Fix NPE in NodeManager#serviceStop on startup failure. Contributed by Bilwa S T.
1 parent 2185249 commit 4530f45

File tree

1 file changed

+5
-3
lines changed
  • hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager

1 file changed

+5
-3
lines changed

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -526,9 +526,11 @@ protected void serviceStop() throws Exception {
526526
DefaultMetricsSystem.shutdown();
527527

528528
// Cleanup ResourcePluginManager
529-
ResourcePluginManager rpm = context.getResourcePluginManager();
530-
if (rpm != null) {
531-
rpm.cleanup();
529+
if (null != context) {
530+
ResourcePluginManager rpm = context.getResourcePluginManager();
531+
if (rpm != null) {
532+
rpm.cleanup();
533+
}
532534
}
533535
} finally {
534536
// YARN-3641: NM's services stop get failed shouldn't block the

0 commit comments

Comments
 (0)