Author: stack
Date: Sun Jul 24 05:21:02 2011
New Revision: 1150282
URL: http://svn.apache.org/viewvc?rev=1150282&view=rev
Log:
HBASE-3465 Hbase should use a HADOOP_HOME environment variable if available
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/bin/hbase
Modified: hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1150282&r1=1150281&r2=1150282&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Sun Jul 24 05:21:02 2011
@@ -328,6 +328,8 @@ Release 0.91.0 - Unreleased
HBASE-4079 HTableUtil - helper class for loading data (Doug Meil via Ted
Yu)
HBASE-3871 Speedup LoadIncrementalHFiles by parallelizing HFile splitting
HBASE-4081 Issues with HRegion.compactStores methods (Ming Ma)
+ HBASE-3465 Hbase should use a HADOOP_HOME environment variable if available
+ (Alejandro Abdelnur)
TASKS
HBASE-3559 Move report of split to master OFF the heartbeat channel
Modified: hbase/trunk/bin/hbase
URL:
http://svn.apache.org/viewvc/hbase/trunk/bin/hbase?rev=1150282&r1=1150281&r2=1150282&view=diff
==============================================================================
--- hbase/trunk/bin/hbase (original)
+++ hbase/trunk/bin/hbase Sun Jul 24 05:21:02 2011
@@ -195,11 +195,34 @@ function append_path() {
fi
}
-# setup 'java.library.path' for native-hadoop code if necessary
-JAVA_LIBRARY_PATH="$HBASE_LIBRARY_PATH"
-if [ -d "${HBASE_HOME}/build/native" -o -d "${HBASE_HOME}/lib/native" ]; then
- JAVA_PLATFORM=`CLASSPATH=${CLASSPATH} ${JAVA}
org.apache.hadoop.util.PlatformName | sed -e "s/ /_/g"`
+JAVA_PLATFORM=""
+
+#If avail, add Hadoop to the CLASSPATH and to the JAVA_LIBRARY_PATH
+if [ ! -z $HADOOP_HOME ]; then
+ HADOOPCPPATH=""
+ if [ -z $HADOOP_CONF_DIR ]; then
+ HADOOPCPPATH=$(append_path "${HADOOPCPPATH}" "${HADOOP_HOME}/conf")
+ else
+ HADOOPCPPATH=$(append_path "${HADOOPCPPATH}" "${HADOOP_CONF_DIR}")
+ fi
+ HADOOPCPPATH=$(append_path "${HADOOPCPPATH}" `ls
${HADOOP_HOME}/hadoop-core*.jar`)
+ for i in "${HADOOP_HOME}/lib/"*.jar; do
+ HADOOPCPPATH="${HADOOPCPPATH}:$i"
+ done
+ CLASSPATH=$(append_path "${HADOOPCPPATH}" "${CLASSPATH}")
+
+ if [ -d "${HADOOP_HOME}/lib/native" ]; then
+ JAVA_PLATFORM=`CLASSPATH=${HADOOPCPPATH} ${JAVA}
org.apache.hadoop.util.PlatformName | sed -e "s/ /_/g"`
+ if [ -d "${HADOOP_HOME}/lib/native/${JAVA_PLATFORM}" ]; then
+ JAVA_LIBRARY_PATH=$(append_path "${JAVA_LIBRARY_PATH}"
"${HADOOP_HOME}/lib/native/${JAVA_PLATFORM}")
+ fi
+ fi
+fi
+if [ -d "${HBASE_HOME}/build/native" -o -d "${HBASE_HOME}/lib/native" ]; then
+ if [ -z $JAVA_PLATFORM ]; then
+ JAVA_PLATFORM=`CLASSPATH=${CLASSPATH} ${JAVA}
org.apache.hadoop.util.PlatformName | sed -e "s/ /_/g"`
+ fi
if [ -d "$HBASE_HOME/build/native" ]; then
JAVA_LIBRARY_PATH=$(append_path "$JAVA_LIBRARY_PATH"
${HBASE_HOME}/build/native/${JAVA_PLATFORM}/lib)
fi
