Repository: hadoop Updated Branches: refs/heads/branch-2 6044b5e5f -> 2cc248816
HADOOP-11924. Tolerate JDK-8047340-related exceptions in Shell#isSetSidAvailable preventing class init. (Tsuyoshi Ozawa via gera) (cherry picked from commit 9f6d67844da3c6ca1de66d426790e741e77f8038) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2cc24881 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2cc24881 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2cc24881 Branch: refs/heads/branch-2 Commit: 2cc2488164703c089f9e7f7532d1bfe3b8a2adac Parents: 6044b5e Author: Gera Shegalov <g...@apache.org> Authored: Thu Jun 4 11:38:28 2015 -0700 Committer: Gera Shegalov <g...@apache.org> Committed: Thu Jun 4 11:47:22 2015 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/util/Shell.java | 11 ++++++++++- .../java/org/apache/hadoop/util/TestStringUtils.java | 3 --- 3 files changed, 13 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2cc24881/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 068a3b2..ca80a5f 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -339,6 +339,9 @@ Release 2.8.0 - UNRELEASED HADOOP-11994. smart-apply-patch wrongly assumes that git is infallible. (Kengo Seki via Arpit Agarwal) + HADOOP-11924. Tolerate JDK-8047340-related exceptions in + Shell#isSetSidAvailable preventing class init. (Tsuyoshi Ozawa via gera) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/2cc24881/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java index f0100d4..c76c921 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java @@ -392,7 +392,16 @@ abstract public class Shell { } catch (IOException ioe) { LOG.debug("setsid is not available on this machine. So not using it."); setsidSupported = false; - } finally { // handle the exit code + } catch (Error err) { + if (err.getMessage().contains("posix_spawn is not " + + "a supported process launch mechanism") + && (Shell.FREEBSD || Shell.MAC)) { + // HADOOP-11924: This is a workaround to avoid failure of class init + // by JDK issue on TR locale(JDK-8047340). + LOG.info("Avoiding JDK-8047340 on BSD-based systems.", err); + setsidSupported = false; + } + } finally { // handle the exit code if (LOG.isDebugEnabled()) { LOG.debug("setsid exited with exit code " + (shexec != null ? shexec.getExitCode() : "(null executor)")); http://git-wip-us.apache.org/repos/asf/hadoop/blob/2cc24881/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestStringUtils.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestStringUtils.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestStringUtils.java index 5b0715f..85ab8c4 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestStringUtils.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestStringUtils.java @@ -417,9 +417,6 @@ public class TestStringUtils extends UnitTestcaseTimeLimit { @Test public void testLowerAndUpperStrings() { - // Due to java bug http://bugs.java.com/bugdatabase/view_bug.do?bug_id=8047340, - // The test will fail with Turkish locality on Mac OS. - Assume.assumeTrue(Shell.LINUX); Locale defaultLocale = Locale.getDefault(); try { Locale.setDefault(new Locale("tr", "TR"));
