Repository: ambari Updated Branches: refs/heads/trunk 129041f54 -> 71cfa6124
AMBARI-15741: Remove PHD references from HAWQ (Lav Jain via mithmatt) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/71cfa612 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/71cfa612 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/71cfa612 Branch: refs/heads/trunk Commit: 71cfa6124e149065a69cca7724ba643b46e71b1f Parents: 129041f Author: Matt <[email protected]> Authored: Thu Apr 7 19:10:19 2016 -0700 Committer: Matt <[email protected]> Committed: Thu Apr 7 19:10:19 2016 -0700 ---------------------------------------------------------------------- .../HAWQ/2.0.0/package/scripts/hawqmaster.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/71cfa612/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqmaster.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqmaster.py b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqmaster.py index 4edf64f..a080158 100644 --- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqmaster.py +++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawqmaster.py @@ -22,10 +22,7 @@ from resource_management.core.logger import Logger from resource_management.libraries.functions.check_process_status import check_process_status from resource_management.libraries.functions.default import default from resource_management.core.source import InlineTemplate -try: - from resource_management.libraries.functions import stack_select as hadoop_select -except ImportError: - from resource_management.libraries.functions import phd_select as hadoop_select +from resource_management.libraries.functions import stack_select import master_helper import common @@ -82,7 +79,10 @@ class HawqMaster(Script): import params Logger.info("Executing HAWQ Check ...") params.File(hawq_constants.hawq_hosts_file, content=InlineTemplate("{% for host in hawq_all_hosts %}{{host}}\n{% endfor %}")) - Execute("source {0} && hawq check -f {1} --hadoop {2} --config {3}".format(hawq_constants.hawq_greenplum_path_file, hawq_constants.hawq_hosts_file, hadoop_select.get_hadoop_dir('home'), hawq_constants.hawq_check_file), + Execute("source {0} && hawq check -f {1} --hadoop {2} --config {3}".format(hawq_constants.hawq_greenplum_path_file, + hawq_constants.hawq_hosts_file, + stack_select.get_hadoop_dir('home'), + hawq_constants.hawq_check_file), user=hawq_constants.hawq_user, timeout=hawq_constants.default_exec_timeout)
