BIGTOP-960. Remove workaround for HBASE-6263 in hbase-thrift start
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/95d8631d Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/95d8631d Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/95d8631d Branch: refs/heads/master Commit: 95d8631d28c4635eb94095bcc2c9b76fb97146a2 Parents: 374cb2f Author: Anatoli Fomenko <[email protected]> Authored: Thu May 2 12:09:13 2013 -0700 Committer: Roman Shaposhnik <[email protected]> Committed: Thu May 2 15:06:07 2013 -0700 ---------------------------------------------------------------------- bigtop-packages/src/common/hbase/hbase.default | 1 - .../src/deb/hbase/install_init_scripts.sh | 2 -- bigtop-packages/src/rpm/hbase/SPECS/hbase.spec | 3 --- 3 files changed, 0 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/95d8631d/bigtop-packages/src/common/hbase/hbase.default ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hbase/hbase.default b/bigtop-packages/src/common/hbase/hbase.default index 3371a2b..910ab86 100644 --- a/bigtop-packages/src/common/hbase/hbase.default +++ b/bigtop-packages/src/common/hbase/hbase.default @@ -16,7 +16,6 @@ export HBASE_PID_DIR="/var/run/hbase" export HBASE_LOG_DIR="/var/log/hbase" export HBASE_IDENT_STRING=hbase -export HBASE_THRIFT_MODE="-nonblocking" # Up to 100 region servers can be run on a single host by specifying offsets # here or as CLI args when using init scripts. Each offset identifies an http://git-wip-us.apache.org/repos/asf/bigtop/blob/95d8631d/bigtop-packages/src/deb/hbase/install_init_scripts.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/hbase/install_init_scripts.sh b/bigtop-packages/src/deb/hbase/install_init_scripts.sh index 07e8f21..c32a5b7 100755 --- a/bigtop-packages/src/deb/hbase/install_init_scripts.sh +++ b/bigtop-packages/src/deb/hbase/install_init_scripts.sh @@ -41,5 +41,3 @@ for node in master regionserver rest thrift ; do 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 http://git-wip-us.apache.org/repos/asf/bigtop/blob/95d8631d/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec b/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec index 37e683b..523899a 100644 --- a/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec +++ b/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec @@ -278,9 +278,6 @@ 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
