From 2b49b39f3c2d5cf178aa2a6473710ce43e00edfd Mon Sep 17 00:00:00 2001 From: Aaron Myers Date: Mon, 8 Oct 2012 21:25:37 +0000 Subject: [PATCH] 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 --- hadoop-common-project/hadoop-common/CHANGES.txt | 4 ---- .../java/org/apache/hadoop/util/NativeCodeLoader.java | 9 ++++++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index f92842dec4..ae8e301d77 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/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 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 a805d8625d..4fe81da101 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,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) {