accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [09/10] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Date Thu, 19 Dec 2013 02:55:09 GMT
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 <elserj@apache.org>
Authored: Wed Dec 18 21:53:25 2013 -0500
Committer: Josh Elser <elserj@apache.org>
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}" \


Mime
View raw message