Author: stack
Date: Thu Sep 8 15:41:41 2011
New Revision: 1166761
URL: http://svn.apache.org/viewvc?rev=1166761&view=rev
Log:
HBASE-4243 HADOOP_HOME should be auto-detected
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=1166761&r1=1166760&r2=1166761&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Thu Sep 8 15:41:41 2011
@@ -459,6 +459,7 @@ Release 0.91.0 - Unreleased
HBASE-4342 Update Thrift to 0.7.0 (Moaz Reyad)
HBASE-4260 Expose a command to manually trigger an HLog roll
(ramkrishna.s.vasudevan)
+ HBASE-4243 HADOOP_HOME should be auto-detected (Roman Shaposhnik)
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=1166761&r1=1166760&r2=1166761&view=diff
==============================================================================
--- hbase/trunk/bin/hbase (original)
+++ hbase/trunk/bin/hbase Thu Sep 8 15:41:41 2011
@@ -205,6 +205,14 @@ function append_path() {
JAVA_PLATFORM=""
+#Try to guess HADOOP_HOME
+if [ -z "$HADOOP_HOME" ]; then
+ HADOOP_IN_PATH=$(readlink -f "$(which hadoop 2>/dev/null)")
+ if [ -f "${HADOOP_IN_PATH}" ]; then
+ HADOOP_HOME=$(readlink -f "$(dirname ${HADOOP_IN_PATH})"/..)
+ fi
+fi
+
#If avail, add Hadoop to the CLASSPATH and to the JAVA_LIBRARY_PATH
if [ ! -z $HADOOP_HOME ]; then
HADOOPCPPATH=""
