hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1196936 - in /hbase/trunk: CHANGES.txt bin/hbase
Date Thu, 03 Nov 2011 04:05:37 GMT
Author: stack
Date: Thu Nov  3 04:05:37 2011
New Revision: 1196936

URL: http://svn.apache.org/viewvc?rev=1196936&view=rev
Log:
HBASE-4719 HBase script assumes pre-Hadoop 0.21 layout of jar files

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=1196936&r1=1196935&r2=1196936&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Thu Nov  3 04:05:37 2011
@@ -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

Modified: hbase/trunk/bin/hbase
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/hbase?rev=1196936&r1=1196935&r2=1196936&view=diff
==============================================================================
--- hbase/trunk/bin/hbase (original)
+++ hbase/trunk/bin/hbase Thu Nov  3 04:05:37 2011
@@ -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



Mime
View raw message