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

(cherry picked from commit 4530f4500d)
This commit is contained in:
Weiwei Yang 2019-06-03 14:09:37 +08:00
parent 056bb773ce
commit e027c87da2
1 changed files with 5 additions and 3 deletions

View File

@ -526,9 +526,11 @@ public class NodeManager extends CompositeService
DefaultMetricsSystem.shutdown(); DefaultMetricsSystem.shutdown();
// Cleanup ResourcePluginManager // Cleanup ResourcePluginManager
ResourcePluginManager rpm = context.getResourcePluginManager(); if (null != context) {
if (rpm != null) { ResourcePluginManager rpm = context.getResourcePluginManager();
rpm.cleanup(); 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