Repository: ambari Updated Branches: refs/heads/branch-2.5 66cb2f3bd -> e675c63bc
AMBARI-18428. Atlas service check never fails (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e675c63b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e675c63b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e675c63b Branch: refs/heads/branch-2.5 Commit: e675c63bc9adbc6fc2cf961aa24fac4254543f29 Parents: 66cb2f3 Author: Andrew Onishuk <aonis...@hortonworks.com> Authored: Thu Sep 22 11:23:11 2016 +0300 Committer: Toader, Sebastian <stoa...@hortonworks.com> Committed: Thu Dec 22 11:05:36 2016 +0100 ---------------------------------------------------------------------- .../ATLAS/0.1.0.2.3/package/scripts/params.py | 4 ++-- .../ATLAS/0.1.0.2.3/package/scripts/service_check.py | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e675c63b/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 2ce480c..ebfc3e6 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 @@ -185,9 +185,9 @@ 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 --negotiate -u : -b ~/cookiejar.txt -c ~/cookiejar.txt -s -o /dev/null -w "%{{http_code}}" {metadata_protocol}://{metadata_host}:{metadata_port}/') + 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 -s -o /dev/null -w "%{{http_code}}" {metadata_protocol}://{metadata_host}:{metadata_port}/') + 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/e675c63b/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 61b3ac0..8cb4f04 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 @@ -32,12 +32,8 @@ class AtlasServiceCheck(Script): Execute(format("{kinit_path_local} -kt {smokeuser_keytab} {smokeuser_principal}"), user=params.smoke_test_user) - try: - Execute(params.smoke_cmd, user=params.smoke_test_user, tries = 5, - try_sleep = 10) - Logger.info('Atlas server up and running') - except: - Logger.debug('Atlas server not running') + Execute(params.smoke_cmd, user=params.smoke_test_user, tries = 5, + try_sleep = 10) if __name__ == "__main__":
