You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by bm...@apache.org on 2011/10/27 00:39:39 UTC
svn commit: r1189511 - in /incubator/bigtop/trunk/bigtop-packages/src:
common/hbase/install_hbase.sh deb/hbase/control
rpm/hbase/SOURCES/hadoop-hbase.sh rpm/hbase/SOURCES/hadoop-hbase.sh.suse
rpm/hbase/SPECS/hbase.spec
Author: bmahe
Date: Wed Oct 26 22:39:39 2011
New Revision: 1189511
URL: http://svn.apache.org/viewvc?rev=1189511&view=rev
Log:
BIGTOP-175. All of HBase wrapper scripts and init.d scripts need to start include find-java code from bigtop-utils
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/hbase/install_hbase.sh
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/control
incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh
incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh.suse
incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
Modified: incubator/bigtop/trunk/bigtop-packages/src/common/hbase/install_hbase.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hbase/install_hbase.sh?rev=1189511&r1=1189510&r2=1189511&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/hbase/install_hbase.sh (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/hbase/install_hbase.sh Wed Oct 26 22:39:39 2011
@@ -120,12 +120,22 @@ wrapper=$PREFIX/usr/bin/hbase
mkdir -p `dirname $wrapper`
cat > $wrapper <<EOF
#!/bin/sh
+
+source /etc/default/hadoop
+source /etc/default/hbase
+
+# Autodetect JAVA_HOME if not defined
+if [ -e /usr/libexec/bigtop-detect-javahome ]; then
+ source /usr/libexec/bigtop-detect-javahome
+elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
+ source /usr/lib/bigtop-utils/bigtop-detect-javahome
+fi
+
export ZOOKEEPER_CONF=\${ZOOKEEPER_CONF:-/etc/zookeeper}
export HADOOP_CONF=\${HADOOP_CONF:-/etc/hadoop/conf}
export ZOOKEEPER_HOME=\${ZOOKEEPER_HOME:-/usr/lib/zookeeper}
-export HADOOP_HOME=\${HADOOP_HOME:-/usr/lib/hadoop}
export HBASE_CLASSPATH=\$ZOOKEEPER_CONF:\$HADOOP_CONF:\$HADOOP_HOME/*:\$HADOOP_HOME/lib/*:\$ZOOKEEPER_HOME/*:\$ZOOKEEPER_HOME/lib/*:\$HBASE_CLASSPATH
-export HBASE_PID_DIR=/var/run/hbase
+
exec /usr/lib/hbase/bin/hbase "\$@"
EOF
chmod 755 $wrapper
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/control?rev=1189511&r1=1189510&r2=1189511&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/control Wed Oct 26 22:39:39 2011
@@ -22,7 +22,7 @@ Homepage: http://hadoop.apache.org/hbase
Package: hadoop-hbase
Architecture: all
-Depends: adduser, hadoop-zookeeper (>= 3.3.1), hadoop
+Depends: adduser, hadoop-zookeeper (>= 3.3.1), hadoop, bigtop-utils
Recommends: ntp
Description: HBase is the Hadoop database
Use it when you need random, realtime read/write access to your Big Data.
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh?rev=1189511&r1=1189510&r2=1189511&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh Wed Oct 26 22:39:39 2011
@@ -34,6 +34,13 @@ set -e
source /etc/default/hadoop
source /etc/default/hbase
+# Autodetect JAVA_HOME if not defined
+if [ -e /usr/libexec/bigtop-detect-javahome ]; then
+ source /usr/libexec/bigtop-detect-javahome
+elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
+ source /usr/lib/bigtop-utils/bigtop-detect-javahome
+fi
+
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON_SCRIPT="/usr/lib/hbase/bin/hbase-daemon.sh"
NAME=HBase
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh.suse
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh.suse?rev=1189511&r1=1189510&r2=1189511&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh.suse (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hadoop-hbase.sh.suse Wed Oct 26 22:39:39 2011
@@ -36,6 +36,12 @@ source /lib/lsb/init-functions
source /etc/default/hadoop
source /etc/default/hbase
+# Autodetect JAVA_HOME if not defined
+if [ -e /usr/libexec/bigtop-detect-javahome ]; then
+ source /usr/libexec/bigtop-detect-javahome
+elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
+ source /usr/lib/bigtop-utils/bigtop-detect-javahome
+fi
STATUS_RUNNING=0
STATUS_DEAD=1
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec?rev=1189511&r1=1189510&r2=1189511&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec Wed Oct 26 22:39:39 2011
@@ -68,7 +68,8 @@ Source4: hadoop-hbase.sh.suse
Source5: hbase.default
Source6: hbase.nofiles.conf
BuildArch: noarch
-Requires: coreutils, /usr/sbin/useradd, /sbin/chkconfig, /sbin/service, hadoop-zookeeper, hadoop >= 0.20.2, hadoop-zookeeper >= 3.3.1
+Requires: coreutils, /usr/sbin/useradd, /sbin/chkconfig, /sbin/service
+Requires: hadoop >= 0.20.2, hadoop-zookeeper >= 3.3.1, bigtop-utils
%if 0%{?mgaversion}
Requires: bsh-utils