Repository: hadoop Updated Branches: refs/heads/trunk de522d2cd -> bc7242298
HADOOP-12638. UnsatisfiedLinkError while checking ISA-L in checknative command. (Kai Sasaki via Colin P. McCabe) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bc724229 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bc724229 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bc724229 Branch: refs/heads/trunk Commit: bc7242298118c701598cb2095f840fb487a230e6 Parents: de522d2 Author: Colin Patrick Mccabe <cmcc...@cloudera.com> Authored: Mon Dec 14 13:11:54 2015 -0800 Committer: Colin Patrick Mccabe <cmcc...@cloudera.com> Committed: Mon Dec 14 13:12:50 2015 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/util/NativeLibraryChecker.java | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/bc724229/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 93766f9..6e26807 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -540,6 +540,9 @@ Trunk (Unreleased) HADOOP-12553. [JDK8] Fix javadoc error caused by illegal tag. (aajisaka) + HADOOP-12638. UnsatisfiedLinkError while checking ISA-L in checknative + command. (Kai Sasaki via Colin P. McCabe) + OPTIMIZATIONS HADOOP-7761. Improve the performance of raw comparisons. (todd) http://git-wip-us.apache.org/repos/asf/hadoop/blob/bc724229/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NativeLibraryChecker.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NativeLibraryChecker.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NativeLibraryChecker.java index c31f85d..46f0897 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NativeLibraryChecker.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NativeLibraryChecker.java @@ -95,12 +95,12 @@ public class NativeLibraryChecker { snappyLibraryName = SnappyCodec.getLibraryName(); } - isalDetail = ErasureCodeNative.getLoadingFailureReason(); - if (isalDetail != null) { - isalLoaded = false; - } else { + try { + isalDetail = ErasureCodeNative.getLoadingFailureReason(); isalDetail = ErasureCodeNative.getLibraryName(); isalLoaded = true; + } catch (UnsatisfiedLinkError e) { + isalLoaded = false; } openSslDetail = OpensslCipher.getLoadingFailureReason(); @@ -146,7 +146,7 @@ public class NativeLibraryChecker { } if ((!nativeHadoopLoaded) || (Shell.WINDOWS && (!winutilsExists)) || - (checkAll && !(zlibLoaded && snappyLoaded && lz4Loaded && bzip2Loaded))) { + (checkAll && !(zlibLoaded && snappyLoaded && lz4Loaded && bzip2Loaded && isalLoaded))) { // return 1 to indicated check failed ExitUtil.terminate(1); }