YARN-7396. NPE when accessing container logs due to null dirsHandler. Contributed by Jonathan Hung

This commit is contained in:
Jian He 2017-11-01 17:00:32 -07:00 committed by Jonathan Hung
parent 16faceb0da
commit 4d82318eb1

View File

@ -373,6 +373,8 @@ protected void serviceInit(Configuration conf) throws Exception {
this.aclsManager = new ApplicationACLsManager(conf); this.aclsManager = new ApplicationACLsManager(conf);
this.dirsHandler = new LocalDirsHandlerService(metrics);
boolean isDistSchedulingEnabled = boolean isDistSchedulingEnabled =
conf.getBoolean(YarnConfiguration.DIST_SCHEDULING_ENABLED, conf.getBoolean(YarnConfiguration.DIST_SCHEDULING_ENABLED,
YarnConfiguration.DEFAULT_DIST_SCHEDULING_ENABLED); YarnConfiguration.DEFAULT_DIST_SCHEDULING_ENABLED);
@ -396,7 +398,6 @@ protected void serviceInit(Configuration conf) throws Exception {
// NodeManager level dispatcher // NodeManager level dispatcher
this.dispatcher = createNMDispatcher(); this.dispatcher = createNMDispatcher();
dirsHandler = new LocalDirsHandlerService(metrics);
nodeHealthChecker = nodeHealthChecker =
new NodeHealthCheckerService( new NodeHealthCheckerService(
getNodeHealthScriptRunner(conf), dirsHandler); getNodeHealthScriptRunner(conf), dirsHandler);