Ver Fonte

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

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1395783 13f79535-47bb-0310-9956-ffa450edef68
Aaron Myers há 12 anos atrás
pai
commit
2b49b39f3c

+ 0 - 4
hadoop-common-project/hadoop-common/CHANGES.txt

@@ -322,10 +322,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

+ 6 - 3
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NativeCodeLoader.java

@@ -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) {