You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2016/02/06 01:14:07 UTC
ambari git commit: AMBARI-14931: HAWQ service checks failing for
single node clusters (nalex via jaoki)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 6903ade21 -> e462af568
AMBARI-14931: HAWQ service checks failing for single node clusters (nalex via jaoki)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e462af56
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e462af56
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e462af56
Branch: refs/heads/branch-2.2
Commit: e462af5688948b9abc891d4ee76ee5bd7fb5b13d
Parents: 6903ade
Author: Jun Aoki <ja...@apache.org>
Authored: Fri Feb 5 16:13:51 2016 -0800
Committer: Jun Aoki <ja...@apache.org>
Committed: Fri Feb 5 16:13:51 2016 -0800
----------------------------------------------------------------------
.../common-services/HAWQ/2.0.0/package/scripts/utils.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e462af56/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/utils.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/utils.py b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/utils.py
index 051ee61..a8036d8 100644
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/utils.py
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/utils.py
@@ -82,7 +82,7 @@ def exec_ssh_cmd(hostname, cmd):
import params
# Only gpadmin should be allowed to run command via ssh, thus not exposing user as a parameter
if params.hostname != hostname:
- cmd = "su - {0} -c \"ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null {1} \\\"{2} \\\" \"".format(hawq_constants.hawq_user, hostname, cmd)
+ cmd = "su - {0} -c 'ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null {1} \"{2} \" '".format(hawq_constants.hawq_user, hostname, cmd)
else:
cmd = "su - {0} -c \"{1}\"".format(hawq_constants.hawq_user, cmd)
Logger.info("Command executed: {0}".format(cmd))
@@ -97,9 +97,9 @@ def exec_psql_cmd(command, host, port, db="template1", tuples_only=True):
"""
src_cmd = "export PGPORT={0} && source {1}".format(port, hawq_constants.hawq_greenplum_path_file)
if tuples_only:
- cmd = src_cmd + " && psql -d {0} -c \\\\\\\"{1};\\\\\\\"".format(db, command)
+ cmd = src_cmd + " && psql -d {0} -c \\\"{1};\\\"".format(db, command)
else:
- cmd = src_cmd + " && psql -t -d {0} -c \\\\\\\"{1};\\\\\\\"".format(db, command)
+ cmd = src_cmd + " && psql -t -d {0} -c \\\"{1};\\\"".format(db, command)
retcode, out, err = exec_ssh_cmd(host, cmd)
if retcode:
Logger.error("SQL command executed failed: {0}\nReturncode: {1}\nStdout: {2}\nStderr: {3}".format(cmd, retcode, out, err))