Bläddra i källkod

AMBARI-20798 Do not run Log Search service check if there is no portal in the cluster. (mgergely)

Change-Id: Ie82bb21ea317ce16f62e2d6e86fa731cb4f60c4f
Miklos Gergely 8 år sedan
förälder
incheckning
3db6bbc5ab

+ 6 - 3
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/service_check.py

@@ -27,9 +27,12 @@ class LogSearchServiceCheck(Script):
     env.set_params(params)
 
     try:
-      Execute(params.smoke_logsearch_cmd, user=params.logsearch_user,
-              tries=15, try_sleep=5, timeout=10)
-      Logger.info('Log Search Server up and running')
+      if params.logsearch_server_host:
+        Execute(params.smoke_logsearch_cmd, user=params.logsearch_user,
+                tries=15, try_sleep=5, timeout=10)
+        Logger.info('Log Search Server up and running')
+      else:
+        Logger.info('No portal is installed on the cluster thus no service check is required')
     except:
       Logger.error('Log Search Server not running')
       raise