Repository: ambari
Updated Branches:
  refs/heads/trunk 07a3a3cff -> 169cb7891


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/169cb789
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/169cb789
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/169cb789

Branch: refs/heads/trunk
Commit: 169cb78912faaccd8807f44e87c05c79cc6844f8
Parents: 07a3a3c
Author: Andrew Onishuk <aonis...@hortonworks.com>
Authored: Thu Sep 22 11:23:11 2016 +0300
Committer: Andrew Onishuk <aonis...@hortonworks.com>
Committed: Thu Sep 22 11:23:11 2016 +0300

----------------------------------------------------------------------
 .../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/169cb789/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 3081295..1a73634 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
@@ -181,9 +181,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/169cb789/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 05ffc14..8e27b38 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
@@ -35,12 +35,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__":

Reply via email to