Repository: bigtop Updated Branches: refs/heads/BIGTOP-2320 f67c51f20 -> ea5f45754
BIGTOP-2321. Fixing /etc/default/hawq Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/ea5f4575 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/ea5f4575 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/ea5f4575 Branch: refs/heads/BIGTOP-2320 Commit: ea5f457545a0d9dc384c85c95ac67704a12578e2 Parents: f67c51f Author: Konstantin Boudnik <[email protected]> Authored: Thu Feb 11 21:08:14 2016 +0300 Committer: Konstantin Boudnik <[email protected]> Committed: Thu Feb 11 21:08:14 2016 +0300 ---------------------------------------------------------------------- bigtop-packages/src/common/hawq/hawq.default | 8 +++++++ bigtop-packages/src/common/hawq/install_hawq.sh | 1 + bigtop-packages/src/common/hawq/run-build.sh | 23 -------------------- 3 files changed, 9 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/ea5f4575/bigtop-packages/src/common/hawq/hawq.default ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hawq/hawq.default b/bigtop-packages/src/common/hawq/hawq.default index 97c46df..f8cf6e1 100644 --- a/bigtop-packages/src/common/hawq/hawq.default +++ b/bigtop-packages/src/common/hawq/hawq.default @@ -20,3 +20,11 @@ export HAWQ_PID_DIR="/var/run/hawq" export HAWQ_LOG_DIR="/var/log/hawq" export HAWQ_WORK_DIR="/var/run/hawq/work" export HAWQ_IDENT_STRING=hawq + +export PATH=$HAWQ_HOME/bin:$HAWQ_HOME/ext/python/bin:$PATH +export LD_LIBRARY_PATH=$HAWQ_HOME/lib:$HAWQ_HOME/ext/python/lib:$LD_LIBRARY_PATH +export PYTHONPATH=$HAWQ_HOME/lib/python:$HAWQ_HOME/lib/python/pygresql:$PYTHONPATH +export OPENSSL_CONF=$HAWQ_CONF_DIR/openssl.cnf +export LIBHDFS3_CONF=$HAWQ_CONF_DIR/hdfs-client.xml +export LIBYARN_CONF=$HAWQ_CONF_DIR/yarn-client.xml +export HAWQSITE_CONF=$HAWQ_CONF_DIR/hawq-site.xml http://git-wip-us.apache.org/repos/asf/bigtop/blob/ea5f4575/bigtop-packages/src/common/hawq/install_hawq.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hawq/install_hawq.sh b/bigtop-packages/src/common/hawq/install_hawq.sh index 8b17132..dfef1c5 100755 --- a/bigtop-packages/src/common/hawq/install_hawq.sh +++ b/bigtop-packages/src/common/hawq/install_hawq.sh @@ -116,6 +116,7 @@ install -d -m 0755 $PREFIX/$MAN_DIR install -d -m 0755 $PREFIX/var/run/hawq/work/ UNZIP_DIR=hawq +cp -a $UNZIP_DIR/greenplum_path.sh $PREFIX/$LIB_DIR cp -ar $UNZIP_DIR/lib $PREFIX/$LIB_DIR cp -a $UNZIP_DIR/etc/* $PREFIX/$CONF_DIR cp -ra $UNZIP_DIR/bin/* $PREFIX/$BIN_DIR http://git-wip-us.apache.org/repos/asf/bigtop/blob/ea5f4575/bigtop-packages/src/common/hawq/run-build.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hawq/run-build.sh b/bigtop-packages/src/common/hawq/run-build.sh deleted file mode 100755 index 5617702..0000000 --- a/bigtop-packages/src/common/hawq/run-build.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -docker run --rm=true -v `pwd`:/data -u root rlei/mydocker:latest /bin/sh -c "date; \ -cd /data/hawq-src/ ; \ -./configure --prefix=/data/hawq ; \ -if [ $? != 0 ]; then - echo HAWQ configure failed. - exit 1 -fi -date; \ -make -f Makefile.hawq-j8; \ -if [ $? != 0 ]; then - echo HAWQ compile failed. - exit 1 -fi -date; \ -make -f Makefile.hawq install ; \ -if [ $? != 0 ]; then - echo HAWQ make install failed. - exit 1 -fi -date; \ -"
