Author: rvs
Date: Mon Jun 25 23:55:27 2012
New Revision: 1353780
URL: http://svn.apache.org/viewvc?rev=1353780&view=rev
Log:
BIGTOP-648. hbase-thrift cannot be started properly
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/hbase/hbase.default
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/install_init_scripts.sh
incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
Modified: incubator/bigtop/trunk/bigtop-packages/src/common/hbase/hbase.default
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hbase/hbase.default?rev=1353780&r1=1353779&r2=1353780&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/hbase/hbase.default
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/hbase/hbase.default Mon
Jun 25 23:55:27 2012
@@ -16,3 +16,4 @@
export HBASE_PID_DIR="/var/run/hbase"
export HBASE_LOG_DIR="/var/log/hbase"
export HBASE_IDENT_STRING=hbase
+export HBASE_THRIFT_MODE="-nonblocking"
Modified:
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/install_init_scripts.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/install_init_scripts.sh?rev=1353780&r1=1353779&r2=1353780&view=diff
==============================================================================
---
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/install_init_scripts.sh
(original)
+++
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/install_init_scripts.sh
Mon Jun 25 23:55:27 2012
@@ -33,3 +33,5 @@ for node in master regionserver rest thr
done
+# FIXME: BIGTOP-648 workaround for HBASE-6263
+sed -i -e 's# start thrift"# start thrift $HBASE_THRIFT_MODE"#'
debian/hbase-thrift/etc/init.d/hbase-thrift
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=1353780&r1=1353779&r2=1353780&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 Mon
Jun 25 23:55:27 2012
@@ -274,6 +274,9 @@ do
chmod 755 $init_file
done
+# FIXME: BIGTOP-648 workaround for HBASE-6263
+sed -i -e 's# start thrift"# start thrift \$HBASE_THRIFT_MODE"#'
$RPM_BUILD_ROOT/%{initd_dir}/hbase-thrift
+
%__install -d -m 0755 $RPM_BUILD_ROOT/usr/bin
# Pull zookeeper and hadoop from their packages
