Repository: ambari Updated Branches: refs/heads/branch-2.5 e5066af0e -> 062a58a4c
AMBARI-18828: Ensure HAWQ -PXF service check uses a tmp directory (mithmatt) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/062a58a4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/062a58a4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/062a58a4 Branch: refs/heads/branch-2.5 Commit: 062a58a4c7a9fcd0e0c5eb16af379892dc1cc871 Parents: e5066af Author: Matt <[email protected]> Authored: Tue Nov 8 15:28:13 2016 -0800 Committer: Matt <[email protected]> Committed: Tue Nov 8 15:28:13 2016 -0800 ---------------------------------------------------------------------- .../common-services/HAWQ/2.0.0/package/scripts/hawq_constants.py | 2 +- .../common-services/HAWQ/2.0.0/package/scripts/service_check.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/062a58a4/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawq_constants.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawq_constants.py b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawq_constants.py index 3ced8d1..ade7acd 100644 --- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawq_constants.py +++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/hawq_constants.py @@ -63,7 +63,7 @@ hawq_keytab_file = "/etc/security/keytabs/hawq.service.keytab" # HAWQ-PXF check params PXF_PORT = "51200" -pxf_hdfs_test_dir = "/user/{0}/hawq_pxf_hdfs_service_check".format(hawq_user) +pxf_hdfs_test_dir = "/tmp/hawq_pxf_hdfs_service_check" # Timeouts default_exec_timeout = 600 http://git-wip-us.apache.org/repos/asf/ambari/blob/062a58a4/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/service_check.py index 6e7ea0f..e0796d8 100644 --- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/service_check.py +++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/service_check.py @@ -164,6 +164,7 @@ class HAWQServiceCheck(Script): params.HdfsResource(hawq_constants.pxf_hdfs_test_dir, type="directory", action="delete_on_execute") + params.HdfsResource(None, action="execute") if __name__ == "__main__":
