Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-4719 HBase script assumes pre-Hadoop 0.21 layout of jar files 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1196936 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2011-11-03 04:05:37 +00:00
parent 5eaea899e3
commit f24e30f5e7
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.txt
View File

@ -445,6 +445,9 @@ Release 0.92.0 - Unreleased
HBASE-4716 Improve locking for single column family bulk load
HBASE-4609 ThriftServer.getRegionInfo() is expecting old ServerName format, need to
use new Addressing class instead (Jonathan Gray)
HBASE-4719 HBase script assumes pre-Hadoop 0.21 layout of jar files
(Roman Shposhnik)
TESTS
HBASE-4450 test for number of blocks read: to serve as baseline for expected

8
bin/hbase
View File

@ -214,7 +214,13 @@ if [ ! -z $HADOOP_HOME ]; then
else
HADOOPCPPATH=$(append_path "${HADOOPCPPATH}" "${HADOOP_CONF_DIR}")
fi
HADOOPCPPATH=$(append_path "${HADOOPCPPATH}" `ls ${HADOOP_HOME}/hadoop-core*.jar`)
if [ "`echo ${HADOOP_HOME}/hadoop-core*.jar`" != "${HADOOP_HOME}/hadoop-core*.jar" ] ; then
HADOOPCPPATH=$(append_path "${HADOOPCPPATH}" `ls ${HADOOP_HOME}/hadoop-core*.jar | head -1`)
else
HADOOPCPPATH=$(append_path "${HADOOPCPPATH}" `ls ${HADOOP_HOME}/hadoop-common*.jar | head -1`)
HADOOPCPPATH=$(append_path "${HADOOPCPPATH}" `ls ${HADOOP_HOME}/hadoop-hdfs*.jar | head -1`)
HADOOPCPPATH=$(append_path "${HADOOPCPPATH}" `ls ${HADOOP_HOME}/hadoop-mapred*.jar | head -1`)
fi
for i in "${HADOOP_HOME}/lib/"*.jar; do
HADOOPCPPATH="${HADOOPCPPATH}:$i"
done