Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4B8E71037D for ; Thu, 19 Dec 2013 02:50:49 +0000 (UTC) Received: (qmail 38764 invoked by uid 500); 19 Dec 2013 02:50:49 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 38744 invoked by uid 500); 19 Dec 2013 02:50:49 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 38726 invoked by uid 99); 19 Dec 2013 02:50:48 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Dec 2013 02:50:48 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id ACFC4E26D; Thu, 19 Dec 2013 02:50:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Thu, 19 Dec 2013 02:50:48 -0000 Message-Id: <8aa9604a577b41bdb25f203c06641c50@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: ACCUMULO-2004 Check for libhadoop.so, not the a directory we think it might be in. Updated Branches: refs/heads/1.5.1-SNAPSHOT 4bed94046 -> a55f5d3f0 ACCUMULO-2004 Check for libhadoop.so, not the a directory we think it might be in. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/53a7d518 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/53a7d518 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/53a7d518 Branch: refs/heads/1.5.1-SNAPSHOT Commit: 53a7d518cacf2d64ccd2ab04fa84242adf8084b1 Parents: 40df8cd Author: Josh Elser Authored: Wed Dec 18 21:30:27 2013 -0500 Committer: Josh Elser Committed: Wed Dec 18 21:30:27 2013 -0500 ---------------------------------------------------------------------- bin/accumulo | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/53a7d518/bin/accumulo ---------------------------------------------------------------------- diff --git a/bin/accumulo b/bin/accumulo index e2a89e9..172951e 100755 --- a/bin/accumulo +++ b/bin/accumulo @@ -131,12 +131,16 @@ CLASSPATH=${XML_FILES}:${START_JAR}:${COMMONS_JCI_JARS} JAVA=$JAVA_HOME/bin/java PLATFORM="`$JAVA -cp $CLASSPATH org.apache.accumulo.start.Platform`" -# hadoop 1.0, 1.1 + +# Try to find the hadoop native library, defaulting to where it should +# be for the default Hadoop version LIB_PATH="$HADOOP_PREFIX/lib/native/$PLATFORM" -if [ ! -d "$LIB_PATH" ]; then - # hadoop-2.0 - LIB_PATH=$HADOOP_PREFIX/lib/native + +if [ -e "$HADOOP_PREFIX/lib/native/libhadoop.so" ]; then + # hadoop-2.0 + LIB_PATH=$HADOOP_PREFIX/lib/native fi + # # app isn't used anywhere, but it makes the process easier to spot when ps/top/snmp truncate the command line exec $JAVA "-Dapp=$1" $ACCUMULO_OPTS -classpath $CLASSPATH -XX:OnOutOfMemoryError="${ACCUMULO_KILL_CMD:-kill -9 %p}" \