You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by rl...@apache.org on 2016/12/20 03:58:57 UTC
incubator-hawq git commit: HAWQ-1227. Fix hawq init fails when user
name with a capital.
Repository: incubator-hawq
Updated Branches:
refs/heads/master 300ef59b5 -> b7ee35aaf
HAWQ-1227. Fix hawq init fails when user name with a capital.
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/b7ee35aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/b7ee35aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/b7ee35aa
Branch: refs/heads/master
Commit: b7ee35aafd748591cbbd892326aa8b04809ce8fc
Parents: 300ef59
Author: rlei <rl...@pivotal.io>
Authored: Mon Dec 19 15:03:26 2016 +0800
Committer: rlei <rl...@pivotal.io>
Committed: Tue Dec 20 11:57:29 2016 +0800
----------------------------------------------------------------------
tools/bin/lib/hawqinit.sh | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/b7ee35aa/tools/bin/lib/hawqinit.sh
----------------------------------------------------------------------
diff --git a/tools/bin/lib/hawqinit.sh b/tools/bin/lib/hawqinit.sh
index 1dd8b48..5ed0f26 100755
--- a/tools/bin/lib/hawqinit.sh
+++ b/tools/bin/lib/hawqinit.sh
@@ -156,7 +156,7 @@ LOAD_GP_TOOLKIT () {
fi
# We need SET SESSION AUTH here to load the toolkit
- ${ECHO} "SET SESSION AUTHORIZATION $ROLNAME;" >> ${TOOLKIT_FILE} 2>&1
+ ${ECHO} "SET SESSION AUTHORIZATION '$ROLNAME';" >> ${TOOLKIT_FILE} 2>&1
RETVAL=$?
if [ $RETVAL -ne 0 ];then
${ECHO} "[FATAL]:-Failed to create the hawq_toolkit sql file." | tee -a ${MASTER_LOG_FILE}
@@ -170,17 +170,17 @@ LOAD_GP_TOOLKIT () {
exit 1
fi
- $PSQL -q -p ${hawq_port} -f ${TOOLKIT_FILE} template1
+ $PSQL -q -v ON_ERROR_STOP=on -p ${hawq_port} -f ${TOOLKIT_FILE} template1
RETVAL=$?
if [ $RETVAL -ne 0 ];then
- ${ECHO} "[FATAL]:-Failed to create the hawq_toolkit schema." | tee -a ${MASTER_LOG_FILE}
+ ${ECHO} "[FATAL]:-Failed to create the hawq_toolkit schema in template1." | tee -a ${MASTER_LOG_FILE}
exit 1
fi
- $PSQL -q -p ${hawq_port} -f ${TOOLKIT_FILE} postgres
+ $PSQL -q -v ON_ERROR_STOP=on -p ${hawq_port} -f ${TOOLKIT_FILE} postgres
RETVAL=$?
if [ $RETVAL -ne 0 ];then
- ${ECHO} "[FATAL]:-Failed to create the hawq_toolkit schema." | tee -a ${MASTER_LOG_FILE}
+ ${ECHO} "[FATAL]:-Failed to create the hawq_toolkit schema in postgres." | tee -a ${MASTER_LOG_FILE}
exit 1
fi