Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-9658. SnappyCodec#checkNativeCodeLoaded may unexpectedly fail when native code is not loaded. Contributed by Zhijie Shen. 

(cherry picked from commit 76fa606e2d)
This commit is contained in:
Tsuyoshi Ozawa 2015-05-04 17:05:00 +09:00
parent 7e03bda3e7
commit 1e1ebbb42b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -164,6 +164,9 @@ Release 2.7.1 - UNRELEASED
HADOOP-11891. OsSecureRandom should lazily fill its reservoir (asuresh) HADOOP-11891. OsSecureRandom should lazily fill its reservoir (asuresh)
HADOOP-9658. SnappyCodec#checkNativeCodeLoaded may unexpectedly fail when
native code is not loaded. (Zhijie Shen via ozawa)
Release 2.7.0 - 2015-04-20 Release 2.7.0 - 2015-04-20
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

3
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/SnappyCodec.java
View File

@ -60,7 +60,8 @@ public class SnappyCodec implements Configurable, CompressionCodec, DirectDecomp
* Are the native snappy libraries loaded & initialized? * Are the native snappy libraries loaded & initialized?
*/ */
public static void checkNativeCodeLoaded() { public static void checkNativeCodeLoaded() {
if (!NativeCodeLoader.buildSupportsSnappy()) { if (!NativeCodeLoader.isNativeCodeLoaded() ||
!NativeCodeLoader.buildSupportsSnappy()) {
throw new RuntimeException("native snappy library not available: " + throw new RuntimeException("native snappy library not available: " +
"this version of libhadoop was built without " + "this version of libhadoop was built without " +
"snappy support."); "snappy support.");