From 35ee354a8192cfbff23e8629a09ea6148a7b86f8 Mon Sep 17 00:00:00 2001
From: Aaron Myers <atm@apache.org>
Date: Mon, 8 Oct 2012 18:46:15 +0000
Subject: [PATCH] HADOOP-8884. DEBUG should be WARN for DEBUG
 util.NativeCodeLoader: Failed to load native-hadoop with error:
 java.lang.UnsatisfiedLinkError. Contributed by Anthony Rojas.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395718 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-common-project/hadoop-common/CHANGES.txt          | 4 ++++
 .../java/org/apache/hadoop/util/NativeCodeLoader.java    | 9 +++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 4ffb7f92db5..1be99a2d41b 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -65,6 +65,10 @@ 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
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NativeCodeLoader.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NativeCodeLoader.java
index 4fe81da1019..a805d8625d2 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NativeCodeLoader.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/NativeCodeLoader.java
@@ -50,12 +50,9 @@ public class NativeCodeLoader {
       LOG.debug("Loaded the native-hadoop library");
       nativeCodeLoaded = true;
     } catch (Throwable 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"));
-      }
+      // 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);
     }
     
     if (!nativeCodeLoaded) {