bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject [3/3] bigtop git commit: BIGTOP-2323. Workaround the issues with hardcoded path to configs
Date Thu, 18 Feb 2016 17:15:36 GMT
BIGTOP-2323. Workaround the issues with hardcoded path to configs


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/6ac64fd9
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/6ac64fd9
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/6ac64fd9

Branch: refs/heads/BIGTOP-2320
Commit: 6ac64fd9c8f5ad272028cc45eb389598f04db8e2
Parents: 95b4b4c
Author: Konstantin Boudnik <cos@apache.org>
Authored: Thu Feb 18 20:14:55 2016 +0300
Committer: Konstantin Boudnik <cos@apache.org>
Committed: Thu Feb 18 20:14:55 2016 +0300

----------------------------------------------------------------------
 bigtop-packages/src/common/hawq/install_hawq.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/6ac64fd9/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 df9945a..d1b7a59 100755
--- a/bigtop-packages/src/common/hawq/install_hawq.sh
+++ b/bigtop-packages/src/common/hawq/install_hawq.sh
@@ -126,7 +126,10 @@ cp -ar $UNZIP_DIR/docs $PREFIX/$DOC_DIR
 
 cp -ar $UNZIP_DIR/../libyarn/* $PREFIX/$LIB_DIR
 
+sed -i -e 's#source %s/greenplum_path.sh" % hawq_home#source /etc/default/hawq#' $PREFIX/$BIN_DIR/hawq
 ln -s $ETC_DIR/conf $PREFIX/$LIB_DIR/config
+## HAWQ-422 configs are expected to sit in this hardcoded locations ;(
+ln -s $PREFIX/$LIB_DIR/config $PREFIX/$LIB_DIR/etc
 
 wrapper=$PREFIX/usr/bin/hawq
 mkdir -p `dirname $wrapper`
@@ -137,7 +140,7 @@ BIGTOP_DEFAULTS_DIR=\${BIGTOP_DEFAULTS_DIR-/etc/default}
 [ -n "\${BIGTOP_DEFAULTS_DIR}" -a -r \${BIGTOP_DEFAULTS_DIR}/hadoop ] && . \${BIGTOP_DEFAULTS_DIR}/hadoop
 [ -n "\${BIGTOP_DEFAULTS_DIR}" -a -r \${BIGTOP_DEFAULTS_DIR}/hawq ] && .  \${BIGTOP_DEFAULTS_DIR}/hawq
 
-exec /usr/lib/hawq/bin/hawq \$1 hawq
+exec /usr/lib/hawq/bin/hawq \$@
 EOF
 chmod 755 $wrapper
 


Mime
View raw message