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

Revert initial commit of HADOOP-8884 per feedback from Todd. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395784 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Aaron Myers 2012-10-08 21:26:43 +00:00
parent 59da1ac1fc
commit c5fc614266
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,10 +65,6 @@ Release 2.0.3-alpha - Unreleased
HADOOP-8881. FileBasedKeyStoresFactory initialization logging should be debug not info. (tucu) HADOOP-8881. FileBasedKeyStoresFactory initialization logging should be debug not info. (tucu)
HADOOP-8884. DEBUG should be WARN for DEBUG util.NativeCodeLoader: Failed
to load native-hadoop with error: java.lang.UnsatisfiedLinkError. (Anthony
Rojas via atm)
Release 2.0.2-alpha - 2012-09-07 Release 2.0.2-alpha - 2012-09-07
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

9
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NativeCodeLoader.java
View File

@ -50,9 +50,12 @@ public class NativeCodeLoader {
LOG.debug("Loaded the native-hadoop library"); LOG.debug("Loaded the native-hadoop library");
nativeCodeLoaded = true; nativeCodeLoaded = true;
} catch (Throwable t) { } catch (Throwable t) {
// Display warning if native-hadoop failed to load // Ignore failure to load
LOG.warn("Continuing after failing to load native-hadoop - java.library.path=" + if(LOG.isDebugEnabled()) {
System.getProperty("java.library.path") + " with error:", t); LOG.debug("Failed to load native-hadoop with error: " + t);
LOG.debug("java.library.path=" +
System.getProperty("java.library.path"));
}
} }
if (!nativeCodeLoaded) { if (!nativeCodeLoaded) {