ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mug...@apache.org
Subject ambari git commit: AMBARI-19386 : ATLAS service check should explicitly run against metadata server host (Vishal Suvagia via mugdha)
Date Thu, 12 Jan 2017 06:12:34 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 0da2852f9 -> 497586479


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

Branch: refs/heads/trunk
Commit: 4975864796b9a301f4e0ee0b36673f41cb0f1b21
Parents: 0da2852
Author: Vishal Suvagia <vishalsuvagia@yahoo.com>
Authored: Tue Jan 10 21:02:55 2017 +0530
Committer: Mugdha Varadkar <mugdha@apache.org>
Committed: Thu Jan 12 11:32:34 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/49758647/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 6a53b1a..4b7bd3c 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
@@ -188,10 +188,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/49758647/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 8e27b38..3525f3e 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
@@ -34,9 +34,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__":


Mime
View raw message