Repository: metron Updated Branches: refs/heads/feature/METRON-1344-test-infrastructure ebc325865 -> fc4ce0104
METRON-1400: Elasticsearch service check fails in Ambari (mmiklavc via mmiklavc) closes apache/metron#904 Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/9d582eac Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/9d582eac Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/9d582eac Branch: refs/heads/feature/METRON-1344-test-infrastructure Commit: 9d582eacd670908ef076da0cef4bd9f566c892c8 Parents: 173ce50 Author: mmiklavc <michael.miklav...@gmail.com> Authored: Wed Jan 24 15:30:00 2018 -0700 Committer: Michael Miklavcic <michael.miklav...@gmail.com> Committed: Wed Jan 24 15:30:00 2018 -0700 ---------------------------------------------------------------------- .../ELASTICSEARCH/5.6.2/package/scripts/service_check.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/9d582eac/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/package/scripts/service_check.py ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/package/scripts/service_check.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/package/scripts/service_check.py index d59954f..4f8b1ab 100755 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/package/scripts/service_check.py +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/ELASTICSEARCH/5.6.2/package/scripts/service_check.py @@ -19,6 +19,7 @@ limitations under the License. """ import subprocess import sys +import re from resource_management.core.resources.system import Execute from resource_management.libraries.script import Script @@ -32,12 +33,14 @@ class ServiceCheck(Script): doc = '{"name": "Ambari Smoke test"}' index = "ambari_smoke_test" - Logger.info("Running Elastic search service check", file=sys.stdout) + # http_port from ES config may be a port range. + es_http_port = re.search("^(\d+)", params.http_port).group(1) + host = params.hostname + ":" + es_http_port + Logger.info("Running Elastic search service check against " + host) # Make sure the service is actually up. We can live without everything allocated. # Need both the retry and ES timeout. Can hit the URL before ES is ready at all and get no response, but can # also hit ES before things are green. - host = "localhost:9200" Execute("curl -XGET 'http://%s/_cluster/health?wait_for_status=green&timeout=120s'" % host, logoutput=True, tries=6,
