Author: atm
Date: Mon Oct 8 21:26:43 2012
New Revision: 1395784
URL: http://svn.apache.org/viewvc?rev=1395784&view=rev
Log:
Revert initial commit of HADOOP-8884 per feedback from Todd.
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NativeCodeLoader.java
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1395784&r1=1395783&r2=1395784&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Mon Oct 8 21:26:43 2012
@@ -65,10 +65,6 @@ Release 2.0.3-alpha - Unreleased
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
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NativeCodeLoader.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NativeCodeLoader.java?rev=1395784&r1=1395783&r2=1395784&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NativeCodeLoader.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NativeCodeLoader.java
Mon Oct 8 21:26:43 2012
@@ -50,9 +50,12 @@ public class NativeCodeLoader {
LOG.debug("Loaded the native-hadoop library");
nativeCodeLoaded = true;
} catch (Throwable t) {
- // Display warning if native-hadoop failed to load
- LOG.warn("Continuing after failing to load native-hadoop -
java.library.path=" +
- System.getProperty("java.library.path") + " with error:", t);
+ // Ignore failure to load
+ if(LOG.isDebugEnabled()) {
+ LOG.debug("Failed to load native-hadoop with error: " + t);
+ LOG.debug("java.library.path=" +
+ System.getProperty("java.library.path"));
+ }
}
if (!nativeCodeLoaded) {
