Repository: hadoop Updated Branches: refs/heads/branch-2 736dd1646 -> c14204808
Revert "YARN-5567. Fix script exit code checking in NodeHealthScriptRunner#reportHealthStatus. (Yufei Gu via rchiang)" This reverts commit 3b19bcb8f0f70606a8080bc46fa64cd34f6280d7. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c1420480 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c1420480 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c1420480 Branch: refs/heads/branch-2 Commit: c142048084f0bf97ccb9c383003fd4b6ee95b222 Parents: 736dd16 Author: Ray Chiang <rchi...@apache.org> Authored: Thu Sep 1 15:10:53 2016 -0700 Committer: Ray Chiang <rchi...@apache.org> Committed: Thu Sep 1 15:10:53 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/util/NodeHealthScriptRunner.java | 3 +-- .../org/apache/hadoop/util/TestNodeHealthScriptRunner.java | 7 ------- 2 files changed, 1 insertion(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c1420480/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 c3bef37..fc392c4 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,7 +106,6 @@ 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. @@ -163,7 +162,7 @@ public class NodeHealthScriptRunner extends AbstractService { setHealthStatus(false, exceptionStackTrace); break; case FAILED_WITH_EXIT_CODE: - setHealthStatus(false, exceptionStackTrace); + setHealthStatus(true, "", now); break; case FAILED: setHealthStatus(false, shexec.getOutput()); http://git-wip-us.apache.org/repos/asf/hadoop/blob/c1420480/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 db61f5a..8fc64d1 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,7 +91,6 @@ 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\""; @@ -125,12 +124,6 @@ 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
