You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by co...@apache.org on 2016/02/25 06:59:07 UTC
bigtop git commit: BIGTOP-2325. Fixing hdfs paths;
service startup options and the workaround for HAWQ-421
Repository: bigtop
Updated Branches:
refs/heads/BIGTOP-2320 62be19376 -> 30ec4352b
BIGTOP-2325. Fixing hdfs paths; service startup options and the workaround for HAWQ-421
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/30ec4352
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/30ec4352
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/30ec4352
Branch: refs/heads/BIGTOP-2320
Commit: 30ec4352ba14dd2eebc485f3224b6255ce1bc11b
Parents: 62be193
Author: Konstantin Boudnik <co...@apache.org>
Authored: Wed Feb 24 21:56:50 2016 -0800
Committer: Konstantin Boudnik <co...@apache.org>
Committed: Wed Feb 24 21:56:50 2016 -0800
----------------------------------------------------------------------
bigtop-deploy/puppet/modules/hawq/templates/hawq-site.xml | 6 ++++++
bigtop-packages/src/common/hadoop/init-hcfs.json | 1 +
bigtop-packages/src/common/hawq/hawq.svc | 7 ++++---
bigtop-packages/src/common/hawq/install_hawq.sh | 2 ++
4 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/30ec4352/bigtop-deploy/puppet/modules/hawq/templates/hawq-site.xml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/hawq/templates/hawq-site.xml b/bigtop-deploy/puppet/modules/hawq/templates/hawq-site.xml
index 74909ef..f3ec4ec 100644
--- a/bigtop-deploy/puppet/modules/hawq/templates/hawq-site.xml
+++ b/bigtop-deploy/puppet/modules/hawq/templates/hawq-site.xml
@@ -148,5 +148,11 @@ under the License.
For example, /sys/fs/cgroup/cpu/hawq for CPU sub-system.
</description>
</property>
+
+ <property>
+ <name>hawq_rm_nvseg_perquery_perseg_limit</name>
+ <value>8</value>
+ <description>This is something that init tries to push in</description>
+ </property>
<!-- HAWQ resource enforcement parameters end here. -->
</configuration>
http://git-wip-us.apache.org/repos/asf/bigtop/blob/30ec4352/bigtop-packages/src/common/hadoop/init-hcfs.json
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hadoop/init-hcfs.json b/bigtop-packages/src/common/hadoop/init-hcfs.json
index 7f9b6cc..a9e0674 100644
--- a/bigtop-packages/src/common/hadoop/init-hcfs.json
+++ b/bigtop-packages/src/common/hadoop/init-hcfs.json
@@ -64,6 +64,7 @@
["/tmp/hadoop-yarn","777","mapred","mapred"],
["/var/log/hadoop-yarn/apps","1777","yarn","mapred"],
["/hbase",null,"hbase","hbase"],
+ ["/hawq_default","755","hawq","hawq"],
["/solr",null,"solr","solr"],
["/benchmarks","777",null,null],
["/user","755","HCFS_SUPER_USER",null],
http://git-wip-us.apache.org/repos/asf/bigtop/blob/30ec4352/bigtop-packages/src/common/hawq/hawq.svc
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hawq/hawq.svc b/bigtop-packages/src/common/hawq/hawq.svc
index c3ddb27..735c82e 100644
--- a/bigtop-packages/src/common/hawq/hawq.svc
+++ b/bigtop-packages/src/common/hawq/hawq.svc
@@ -15,9 +15,10 @@
DAEMON="hawq"
DESC="hawq daemon"
-EXEC_PATH="\${HAWQ_HOME}/bin/include/service.sh"
+EXEC_PATH="\${HAWQ_HOME}/bin/hawq"
SVC_USER="hawq"
PIDFILE="\${HAWQ_PID_DIR}/${DAEMON}.pid"
+SVC_OPTS="-l \${HAWQ_LOG_DIR}"
generate_start() {
@@ -33,7 +34,7 @@ start() {
exit 0
fi
- su -s /bin/bash ${SVC_USER} -c "${EXEC_PATH} start ${DAEMON}"
+ su -s /bin/bash ${SVC_USER} -c "${EXEC_PATH} start master $SVC_OPTS"
checkstatusofproc
RETVAL=$?
@@ -50,7 +51,7 @@ cat <<'__EOT__'
stop() {
log_success_msg "Stopping $DESC (${DAEMON}): "
- su -s /bin/bash ${SVC_USER} -c "${EXEC_PATH} stop ${DAEMON}"
+ su -s /bin/bash ${SVC_USER} -c "${EXEC_PATH} stop master $SVC_OPTS"
sleep 3
RETVAL=$?
http://git-wip-us.apache.org/repos/asf/bigtop/blob/30ec4352/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 d1b7a59..af58ec6 100755
--- a/bigtop-packages/src/common/hawq/install_hawq.sh
+++ b/bigtop-packages/src/common/hawq/install_hawq.sh
@@ -130,6 +130,8 @@ sed -i -e 's#source %s/greenplum_path.sh" % hawq_home#source /etc/default/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
+# HAWQ-421
+ln -s $ETC_DIR/default/hawq $PREFIX/$LIB_DIR/greenplum_path.sh
wrapper=$PREFIX/usr/bin/hawq
mkdir -p `dirname $wrapper`