BIGTOP-2321. Add packaging code for HAWQ Fixing service templates to accomodate direct use of pg_ctl
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/b06b8bab Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/b06b8bab Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/b06b8bab Branch: refs/heads/BIGTOP-2320 Commit: b06b8bab07f1856771e0d5606d0df404c8e5ea60 Parents: 05d6f1f Author: Cos <[email protected]> Authored: Fri Mar 11 20:04:31 2016 -0600 Committer: Cos <[email protected]> Committed: Fri Mar 11 20:04:31 2016 -0600 ---------------------------------------------------------------------- bigtop-packages/src/common/hawq/hawq-master.svc | 12 ++++++------ bigtop-packages/src/common/hawq/hawq-segment.svc | 13 +++++++------ 2 files changed, 13 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/b06b8bab/bigtop-packages/src/common/hawq/hawq-master.svc ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hawq/hawq-master.svc b/bigtop-packages/src/common/hawq/hawq-master.svc index bd60980..4fa5097 100644 --- a/bigtop-packages/src/common/hawq/hawq-master.svc +++ b/bigtop-packages/src/common/hawq/hawq-master.svc @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -DAEMON="hawq master" -DESC="hawq master daemon" -EXEC_PATH="\${HAWQ_HOME}/bin/hawq" +DAEMON="hawq-master" +DESC="master daemon" +EXEC_PATH="\${HAWQ_HOME}/bin/pg_ctL" SVC_USER="hawq" PIDFILE="\${HAWQ_PID_DIR}/${DAEMON}.pid" -SVC_OPTS="-l \${HAWQ_LOG_DIR}" +SVC_OPTS="-w -t \${HAWQ_TIMEOUT} -m \${HAWQ_SHUTDOWN_MODE} -D \${HAWQ_MASTERDATA_DIR} -l \${HAWQ_LOG_DIR}" generate_start() { @@ -34,7 +34,7 @@ start() { exit 0 fi - su -s /bin/bash ${SVC_USER} -c "${EXEC_PATH} start master $SVC_OPTS" + su -s /bin/bash ${SVC_USER} -c "${EXEC_PATH} start $SVC_OPTS" checkstatusofproc RETVAL=$? @@ -51,7 +51,7 @@ cat <<'__EOT__' stop() { log_success_msg "Stopping $DESC (${DAEMON}): " - su -s /bin/bash ${SVC_USER} -c "${EXEC_PATH} stop master $SVC_OPTS" + su -s /bin/bash ${SVC_USER} -c "${EXEC_PATH} stop $SVC_OPTS" sleep 3 RETVAL=$? http://git-wip-us.apache.org/repos/asf/bigtop/blob/b06b8bab/bigtop-packages/src/common/hawq/hawq-segment.svc ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hawq/hawq-segment.svc b/bigtop-packages/src/common/hawq/hawq-segment.svc index 0b4acab..b88dc12 100644 --- a/bigtop-packages/src/common/hawq/hawq-segment.svc +++ b/bigtop-packages/src/common/hawq/hawq-segment.svc @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -DAEMON="hawq segment" -DESC="hawq segment daemon" -EXEC_PATH="\${HAWQ_HOME}/bin/hawq" +DAEMON="hawq-segment" +DESC="segment daemon" +EXEC_PATH="\${HAWQ_HOME}/bin/pg_ctl" SVC_USER="hawq" PIDFILE="\${HAWQ_PID_DIR}/${DAEMON}.pid" -SVC_OPTS="-l \${HAWQ_LOG_DIR}" +SVC_OPTS="-D \${HAWQ_SEGMENTDATA_DIR} -l \${HAWQ_LOG_DIR} -p \${HAWQ_SEGMENT_PORT} \ + --silent-mode=true -M segment -i" generate_start() { @@ -34,7 +35,7 @@ start() { exit 0 fi - su -s /bin/bash ${SVC_USER} -c "${EXEC_PATH} start segment $SVC_OPTS" + su -s /bin/bash ${SVC_USER} -c "${EXEC_PATH} start $SVC_OPTS" checkstatusofproc RETVAL=$? @@ -51,7 +52,7 @@ cat <<'__EOT__' stop() { log_success_msg "Stopping $DESC (${DAEMON}): " - su -s /bin/bash ${SVC_USER} -c "${EXEC_PATH} stop segment $SVC_OPTS" + su -s /bin/bash ${SVC_USER} -c "${EXEC_PATH} stop $SVC_OPTS" sleep 3 RETVAL=$?
