You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by ma...@apache.org on 2013/07/16 20:01:33 UTC
git commit: BIGTOP-955. HBase installation should advertise its
location and configuration
Updated Branches:
refs/heads/master 9914667c3 -> e8f88d13c
BIGTOP-955. HBase installation should advertise its location and configuration
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/e8f88d13
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/e8f88d13
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/e8f88d13
Branch: refs/heads/master
Commit: e8f88d13ce690c2be0d316eda7d2833d1d8f0e5a
Parents: 9914667
Author: Nick Dimiduk <nd...@gmail.com>
Authored: Wed May 1 14:59:48 2013 -0700
Committer: Sean Mackrory <ma...@apache.org>
Committed: Tue Jul 16 11:00:49 2013 -0700
----------------------------------------------------------------------
bigtop-packages/src/common/hbase/hbase.default | 3 +++
bigtop-packages/src/common/hcatalog/install_hcatalog.sh | 5 +++++
bigtop-packages/src/common/hive/install_hive.sh | 5 +++++
bigtop-packages/src/common/pig/install_pig.sh | 8 +++-----
4 files changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e8f88d13/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 910ab86..0f86de8 100644
--- a/bigtop-packages/src/common/hbase/hbase.default
+++ b/bigtop-packages/src/common/hbase/hbase.default
@@ -13,6 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+export HBASE_HOME="/usr/lib/hbase"
+export HBASE_CONF_DIR="/etc/hbase/conf"
+
export HBASE_PID_DIR="/var/run/hbase"
export HBASE_LOG_DIR="/var/log/hbase"
export HBASE_IDENT_STRING=hbase
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e8f88d13/bigtop-packages/src/common/hcatalog/install_hcatalog.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hcatalog/install_hcatalog.sh b/bigtop-packages/src/common/hcatalog/install_hcatalog.sh
index bc5afc6..aa9fc5b 100644
--- a/bigtop-packages/src/common/hcatalog/install_hcatalog.sh
+++ b/bigtop-packages/src/common/hcatalog/install_hcatalog.sh
@@ -117,6 +117,11 @@ cat >>$wrapper <<EOF
#!/bin/sh
. /etc/default/hadoop
+# look for HBase
+if [ -f /etc/default/hbase ] ; then
+ . /etc/default/hbase
+fi
+
# Autodetect JAVA_HOME if not defined
. /usr/lib/bigtop-utils/bigtop-detect-javahome
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e8f88d13/bigtop-packages/src/common/hive/install_hive.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hive/install_hive.sh b/bigtop-packages/src/common/hive/install_hive.sh
index 8ffc6b0..745c760 100755
--- a/bigtop-packages/src/common/hive/install_hive.sh
+++ b/bigtop-packages/src/common/hive/install_hive.sh
@@ -123,6 +123,11 @@ do
# Autodetect JAVA_HOME if not defined
. /usr/lib/bigtop-utils/bigtop-detect-javahome
+# look for HBase
+if [ -f /etc/default/hbase ] ; then
+ . /etc/default/hbase
+fi
+
export HIVE_HOME=$INSTALLED_LIB_DIR
exec $INSTALLED_LIB_DIR/bin/$file "\$@"
EOF
http://git-wip-us.apache.org/repos/asf/bigtop/blob/e8f88d13/bigtop-packages/src/common/pig/install_pig.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/pig/install_pig.sh b/bigtop-packages/src/common/pig/install_pig.sh
index 6ac1b96..c3068f6 100644
--- a/bigtop-packages/src/common/pig/install_pig.sh
+++ b/bigtop-packages/src/common/pig/install_pig.sh
@@ -134,11 +134,9 @@ cat > $PREFIX/$BIN_DIR/pig <<EOF
# Autodetect JAVA_HOME if not defined
. /usr/lib/bigtop-utils/bigtop-detect-javahome
-# FIXME: a workaround for PIG-2786
-# HBase integration support
-HBASE_BINARY=\`PATH=\${HBASE_HOME}:\$PATH which hbase\`
-if [ -n "\$HBASE_BINARY" ] ; then
- export PIG_CLASSPATH=\$PIG_CLASSPATH:\`\$HBASE_BINARY classpath\`
+# look for HBase
+if [ -f /etc/default/hbase ] ; then
+ . /etc/default/hbase
fi
exec $INSTALLED_LIB_DIR/bin/pig "\$@"