Permalink
Browse files

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
  • Loading branch information...
1 parent 16709ed commit 48caefa913cae7563918195d189330c29370c97c @saintstack saintstack committed Nov 3, 2011
Showing with 10 additions and 1 deletion.
  1. +3 −0 CHANGES.txt
  2. +7 −1 bin/hbase
View
@@ -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
View
@@ -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

0 comments on commit 48caefa

Please sign in to comment.