Browse Source

AMBARI-19386 : ATLAS service check should explicitly run against metadata server host (Vishal Suvagia via mugdha)

Vishal Suvagia 8 years ago
parent
commit
20380d6927

+ 0 - 4
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')
 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
 hbase_conf_dir = "/etc/hbase/conf"
 hbase_conf_dir = "/etc/hbase/conf"

+ 7 - 3
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:
     if params.security_enabled:
       Execute(format("{kinit_path_local} -kt {smokeuser_keytab} {smokeuser_principal}"),
       Execute(format("{kinit_path_local} -kt {smokeuser_keytab} {smokeuser_principal}"),
               user=params.smoke_test_user)
               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__":
 if __name__ == "__main__":