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 09D30103C9 for ; Thu, 19 Dec 2013 02:55:02 +0000 (UTC) Received: (qmail 44938 invoked by uid 500); 19 Dec 2013 02:55:01 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 44833 invoked by uid 500); 19 Dec 2013 02:55:01 -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 44746 invoked by uid 99); 19 Dec 2013 02:55:01 -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:55:01 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6BDAAE2A4; Thu, 19 Dec 2013 02:55:01 +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:55:09 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [09/10] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: bin/accumulo Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/152f1942 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/152f1942 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/152f1942 Branch: refs/heads/master Commit: 152f1942ee894d75836d6d9321585913bc176e79 Parents: 5d952c7 a55f5d3 Author: Josh Elser Authored: Wed Dec 18 21:53:25 2013 -0500 Committer: Josh Elser Committed: Wed Dec 18 21:53:25 2013 -0500 ---------------------------------------------------------------------- bin/accumulo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/152f1942/bin/accumulo ---------------------------------------------------------------------- diff --cc bin/accumulo index 14918c8,2ad8720..89f5624 --- a/bin/accumulo +++ b/bin/accumulo @@@ -125,29 -104,26 +125,29 @@@ if [ ! -d "${ACCUMULO_LOG_DIR}" ]; the mkdir -p "$ACCUMULO_LOG_DIR" fi -# Export the variables just in case they are not exported -# This makes them available to java -export JAVA_HOME HADOOP_PREFIX ZOOKEEPER_HOME - -JAVA="${JAVA_HOME}/bin/java" -PLATFORM=$( "${JAVA}" -cp "${CLASSPATH}" org.apache.accumulo.start.Platform ) - -# 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}" +# This is default for hadoop 2.x; +# for hadoop 1.0, 1.1, specify (DY)LD_LIBRARY_PATH +# explicitly in ${ACCUMULO_HOME}/conf/accumulo-env.sh +# usually something like: +# ${HADOOP_PREFIX}/lib/native/${PLATFORM} - if [ -d "${HADOOP_PREFIX}/lib/native" ]; then + if [ -e "${HADOOP_PREFIX}/lib/native/libhadoop.so" ]; then - # hadoop-2.0 LIB_PATH="${HADOOP_PREFIX}/lib/native" + LD_LIBRARY_PATH="${LIB_PATH}:${LD_LIBRARY_PATH}" # For Linux + DYLD_LIBRARY_PATH="${LIB_PATH}:${DYLD_LIBRARY_PATH}" # For Mac fi +# Export the variables just in case they are not exported +# This makes them available to java +export JAVA_HOME HADOOP_PREFIX ZOOKEEPER_HOME LD_LIBRARY_PATH DYLD_LIBRARY_PATH # # 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}" \ +JAVA="${JAVA_HOME}/bin/java" +exec $JAVA "-Dapp=$1" \ + $ACCUMULO_OPTS \ + -classpath "${CLASSPATH}" \ + -XX:OnOutOfMemoryError="${ACCUMULO_KILL_CMD:-kill -9 %p}" \ + -XX:-OmitStackTraceInFastThrow \ -Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl \ - -Djava.library.path="${LIB_PATH}" \ -Dorg.apache.accumulo.core.home.dir="${ACCUMULO_HOME}" \ -Dhadoop.home.dir="${HADOOP_PREFIX}" \ -Dzookeeper.home.dir="${ZOOKEEPER_HOME}" \