BIGTOP-2325. Deployment recipes for HAWQ Making sure corrent info is added to the the default file
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/05d6f1ff Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/05d6f1ff Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/05d6f1ff Branch: refs/heads/BIGTOP-2320 Commit: 05d6f1fff231520375d408c26307c14b1ea04309 Parents: ea63538 Author: Cos <[email protected]> Authored: Fri Mar 11 20:03:22 2016 -0600 Committer: Cos <[email protected]> Committed: Fri Mar 11 20:03:22 2016 -0600 ---------------------------------------------------------------------- bigtop-deploy/puppet/modules/hawq/manifests/init.pp | 2 ++ bigtop-deploy/puppet/modules/hawq/templates/hawq-site.xml | 4 ++-- bigtop-deploy/puppet/modules/hawq/templates/hawq.default | 8 ++++++++ bigtop-packages/src/common/hawq/hawq.default | 10 ++++++++++ 4 files changed, 22 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/05d6f1ff/bigtop-deploy/puppet/modules/hawq/manifests/init.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/hawq/manifests/init.pp b/bigtop-deploy/puppet/modules/hawq/manifests/init.pp index 73079c2..39ecb34 100644 --- a/bigtop-deploy/puppet/modules/hawq/manifests/init.pp +++ b/bigtop-deploy/puppet/modules/hawq/manifests/init.pp @@ -27,6 +27,8 @@ class hawq { $hawq_head_port = hiera('bigtop::hawq_master_port', "5432") $hawq_yarn_rm_host = hiera('hadoop::common_yarn::hadoop_rm_host') $hawq_yarn_rm_port = hiera('hadoop::common_yarn::hadoop_rm_port') + $hawq_masterdata_dir = hiera('bigtop::hawq_master_datadir', "/var/run/hawq/work/hawq-data-directory/masterdd") + $hawq_segmentdata_dir = hiera('bigtop::hawq_segment_datadir', "/hawq/work/hawq-data-directory/segmentdd") package { "hawq": ensure => latest, http://git-wip-us.apache.org/repos/asf/bigtop/blob/05d6f1ff/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 f3ec4ec..713fa40 100644 --- a/bigtop-deploy/puppet/modules/hawq/templates/hawq-site.xml +++ b/bigtop-deploy/puppet/modules/hawq/templates/hawq-site.xml @@ -52,13 +52,13 @@ under the License. <property> <name>hawq_master_directory</name> - <value>~/hawq-data-directory/masterdd</value> + <value><% @hawq_masterdata_dir %></value> <description>The directory of hawq master.</description> </property> <property> <name>hawq_segment_directory</name> - <value>~/hawq-data-directory/segmentdd</value> + <value><% @hawq_segmentdata_dir %>d</value> <description>The directory of hawq segment.</description> </property> http://git-wip-us.apache.org/repos/asf/bigtop/blob/05d6f1ff/bigtop-deploy/puppet/modules/hawq/templates/hawq.default ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/hawq/templates/hawq.default b/bigtop-deploy/puppet/modules/hawq/templates/hawq.default index 19da99e..8190260 100644 --- a/bigtop-deploy/puppet/modules/hawq/templates/hawq.default +++ b/bigtop-deploy/puppet/modules/hawq/templates/hawq.default @@ -30,3 +30,11 @@ 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 + +export HAWQ_MASTER_PORT=5432 +export HAWQ_SEGMENT_PORT=40000 +export HAWQ_MASTERDATA_DIR=<%= @hawq_masterdata_dir %> +export HAWQ_SEGMENTDATA_DIR=<%= @hawq_segmentdata_dir %> + +export HAWQ_TIMEOUT=30 +export HAWQ_SHUTDOWN_MODE=smart http://git-wip-us.apache.org/repos/asf/bigtop/blob/05d6f1ff/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 f8cf6e1..574e845 100644 --- a/bigtop-packages/src/common/hawq/hawq.default +++ b/bigtop-packages/src/common/hawq/hawq.default @@ -21,6 +21,8 @@ export HAWQ_LOG_DIR="/var/log/hawq" export HAWQ_WORK_DIR="/var/run/hawq/work" export HAWQ_IDENT_STRING=hawq +export HAWQ_DATA_DIR=$HAWQ_WORK_DIR/hawq-data-directory + 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 @@ -28,3 +30,11 @@ 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 + +export HAWQ_MASTER_PORT=5432 +export HAWQ_SEGMENT_PORT=40000 +export HAWQ_MASTERDATA_DIR=$HAWQ_DATA_DIR/masterdd +export HAWQ_SEGMENTDATA_DIR=$HAWQ_DATA_DIR/segmentdd + +export HAWQ_TIMEOUT=30 +export HAWQ_SHUTDOWN_MODE=smart
