You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/03/14 20:15:23 UTC

svn commit: r1456618 - /accumulo/trunk/bin/accumulo

Author: ecn
Date: Thu Mar 14 19:15:22 2013
New Revision: 1456618

URL: http://svn.apache.org/r1456618
Log:
ACCUMULO-804 pick up the location of the native libs in the hadoop-2.0 binary package

Modified:
    accumulo/trunk/bin/accumulo

Modified: accumulo/trunk/bin/accumulo
URL: http://svn.apache.org/viewvc/accumulo/trunk/bin/accumulo?rev=1456618&r1=1456617&r2=1456618&view=diff
==============================================================================
--- accumulo/trunk/bin/accumulo (original)
+++ accumulo/trunk/bin/accumulo Thu Mar 14 19:15:22 2013
@@ -109,11 +109,17 @@ export JAVA_HOME HADOOP_PREFIX ZOOKEEPER
 
 JAVA="$JAVA_HOME/bin/java"
 PLATFORM=$( $JAVA -cp $CLASSPATH org.apache.accumulo.start.Platform )
+# hadoop 1.0, 1.1
+LIB_PATH="$HADOOP_PREFIX/lib/native/$PLATFORM"
+if [ ! -d "$LIB_PATH" ]; 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="kill -9 %p" \
    -Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl \
-   -Djava.library.path="$HADOOP_PREFIX/lib/native/$PLATFORM" \
+   -Djava.library.path="$LIB_PATH" \
    -Dorg.apache.accumulo.core.home.dir="$ACCUMULO_HOME" \
    -Dhadoop.home.dir="$HADOOP_PREFIX" \
    -Dzookeeper.home.dir="$ZOOKEEPER_HOME" \