Repository: ambari Updated Branches: refs/heads/branch-2.5 232cfd623 -> 20380d692
AMBARI-19386 : ATLAS service check should explicitly run against metadata server host (Vishal Suvagia via mugdha) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/20380d69 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/20380d69 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/20380d69 Branch: refs/heads/branch-2.5 Commit: 20380d69270ab64933855dd1668305b14f39e91c Parents: 232cfd6 Author: Vishal Suvagia <vishalsuva...@yahoo.com> Authored: Tue Jan 10 21:02:55 2017 +0530 Committer: Mugdha Varadkar <mug...@apache.org> Committed: Thu Jan 12 11:43:27 2017 +0530 ---------------------------------------------------------------------- .../ATLAS/0.1.0.2.3/package/scripts/params.py | 4 ---- .../ATLAS/0.1.0.2.3/package/scripts/service_check.py | 10 +++++++--- 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/20380d69/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py index 8704d3e..9373f17 100644 --- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py @@ -186,10 +186,6 @@ smokeuser_keytab = config['configurations']['cluster-env']['smokeuser_keytab'] security_check_status_file = format('{log_dir}/security_check.status') -if security_enabled: - smoke_cmd = format('curl -k --negotiate -u : -b ~/cookiejar.txt -c ~/cookiejar.txt -s -o /dev/null -w "%{{http_code}}" {metadata_protocol}://{metadata_host}:{metadata_port}/') -else: - smoke_cmd = format('curl -k -s -o /dev/null -w "%{{http_code}}" {metadata_protocol}://{metadata_host}:{metadata_port}/') # hbase hbase_conf_dir = "/etc/hbase/conf" http://git-wip-us.apache.org/repos/asf/ambari/blob/20380d69/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/service_check.py index 8cb4f04..943bc4d 100644 --- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/service_check.py +++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/service_check.py @@ -31,9 +31,13 @@ class AtlasServiceCheck(Script): if params.security_enabled: Execute(format("{kinit_path_local} -kt {smokeuser_keytab} {smokeuser_principal}"), user=params.smoke_test_user) - - Execute(params.smoke_cmd, user=params.smoke_test_user, tries = 5, - try_sleep = 10) + for atlas_host in params.atlas_hosts: + if params.security_enabled: + smoke_cmd = format('curl -k --negotiate -u : -b ~/cookiejar.txt -c ~/cookiejar.txt -s -o /dev/null -w "%{{http_code}}" {metadata_protocol}://{atlas_host}:{metadata_port}/') + else: + smoke_cmd = format('curl -k -s -o /dev/null -w "%{{http_code}}" {metadata_protocol}://{atlas_host}:{metadata_port}/') + Execute(smoke_cmd , user=params.smoke_test_user, tries = 5, + try_sleep = 10) if __name__ == "__main__":
