YARN-5567. Fix script exit code checking in NodeHealthScriptRunner#reportHealthStatus. (Yufei Gu via rchiang)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/05ede003 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/05ede003 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/05ede003 Branch: refs/heads/HDFS-7240 Commit: 05ede003868871addc30162e9707c3dc14ed6b7a Parents: 8b57be1 Author: Ray Chiang <rchi...@apache.org> Authored: Mon Aug 29 15:55:33 2016 -0700 Committer: Ray Chiang <rchi...@apache.org> Committed: Mon Aug 29 15:55:33 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/util/NodeHealthScriptRunner.java | 3 ++- .../org/apache/hadoop/util/TestNodeHealthScriptRunner.java | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/05ede003/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NodeHealthScriptRunner.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NodeHealthScriptRunner.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NodeHealthScriptRunner.java index fc392c4..c3bef37 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NodeHealthScriptRunner.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NodeHealthScriptRunner.java @@ -106,6 +106,7 @@ public class NodeHealthScriptRunner extends AbstractService { shexec.execute(); } catch (ExitCodeException e) { // ignore the exit code of the script + exceptionStackTrace = StringUtils.stringifyException(e); status = HealthCheckerExitStatus.FAILED_WITH_EXIT_CODE; // On Windows, we will not hit the Stream closed IOException // thrown by stdout buffered reader for timeout event. @@ -162,7 +163,7 @@ public class NodeHealthScriptRunner extends AbstractService { setHealthStatus(false, exceptionStackTrace); break; case FAILED_WITH_EXIT_CODE: - setHealthStatus(true, "", now); + setHealthStatus(false, exceptionStackTrace); break; case FAILED: setHealthStatus(false, shexec.getOutput()); http://git-wip-us.apache.org/repos/asf/hadoop/blob/05ede003/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestNodeHealthScriptRunner.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestNodeHealthScriptRunner.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestNodeHealthScriptRunner.java index 8fc64d1..db61f5a 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestNodeHealthScriptRunner.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestNodeHealthScriptRunner.java @@ -91,6 +91,7 @@ public class TestNodeHealthScriptRunner { public void testNodeHealthScript() throws Exception { String errorScript = "echo ERROR\n echo \"Tracker not healthy\""; String normalScript = "echo \"I am all fine\""; + String failWithExitCodeScript = "echo \"Not healthy\"; exit -1"; String timeOutScript = Shell.WINDOWS ? "@echo off\nping -n 4 127.0.0.1 >nul\necho \"I am fine\"" : "sleep 4\necho \"I am fine\""; @@ -124,6 +125,12 @@ public class TestNodeHealthScriptRunner { nodeHealthScriptRunner.isHealthy()); Assert.assertEquals("", nodeHealthScriptRunner.getHealthReport()); + // Script which fails with exit code. + writeNodeHealthScriptFile(failWithExitCodeScript, true); + timerTask.run(); + Assert.assertFalse("Node health status reported healthy", + nodeHealthScriptRunner.isHealthy()); + // Timeout script. writeNodeHealthScriptFile(timeOutScript, true); timerTask.run(); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
