diff --git hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NodeHealthScriptRunner.java hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NodeHealthScriptRunner.java index 568ad5b..fc392c4 100644 --- hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NodeHealthScriptRunner.java +++ hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NodeHealthScriptRunner.java @@ -214,11 +214,6 @@ protected void serviceInit(Configuration conf) throws Exception { */ @Override protected void serviceStart() throws Exception { - // if health script path is not configured don't start the thread. - if (!shouldRun(nodeHealthScript)) { - LOG.info("Not starting node health monitor"); - return; - } nodeHealthScriptScheduler = new Timer("NodeHealthMonitor-Timer", true); // Start the timer task immediately and // then periodically at interval time. @@ -232,9 +227,6 @@ protected void serviceStart() throws Exception { */ @Override protected void serviceStop() { - if (!shouldRun(nodeHealthScript)) { - return; - } if (nodeHealthScriptScheduler != null) { nodeHealthScriptScheduler.cancel(); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeHealthCheckerService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeHealthCheckerService.java index 02b318a..c1a159a 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeHealthCheckerService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeHealthCheckerService.java @@ -21,7 +21,6 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.service.CompositeService; import org.apache.hadoop.util.NodeHealthScriptRunner; -import org.apache.hadoop.yarn.conf.YarnConfiguration; /** * The class which provides functionality of checking the health of the node and @@ -44,8 +43,7 @@ public NodeHealthCheckerService(NodeHealthScriptRunner scriptRunner, @Override protected void serviceInit(Configuration conf) throws Exception { - if (NodeHealthScriptRunner.shouldRun( - conf.get(YarnConfiguration.NM_HEALTH_CHECK_SCRIPT_PATH))) { + if (nodeHealthScriptRunner != null) { addService(nodeHealthScriptRunner); } addService(dirsHandler); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java index a4be120..97819d2 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java @@ -187,7 +187,9 @@ public static NodeHealthScriptRunner getNodeHealthScriptRunner(Configuration con String nodeHealthScript = conf.get(YarnConfiguration.NM_HEALTH_CHECK_SCRIPT_PATH); if(!NodeHealthScriptRunner.shouldRun(nodeHealthScript)) { - LOG.info("Abey khali"); + LOG.info("Node Manager health check script is not available " + + "or doesn't have execute permission, so not " + + "starting the node health script runner."); return null; } long nmCheckintervalTime = conf.getLong(