ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mgerg...@apache.org
Subject ambari git commit: AMBARI-20798 Do not run Log Search service check if there is no portal in the cluster. (mgergely)
Date Fri, 21 Apr 2017 11:40:58 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 27b322117 -> 3db6bbc5a


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

Change-Id: Ie82bb21ea317ce16f62e2d6e86fa731cb4f60c4f


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3db6bbc5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3db6bbc5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3db6bbc5

Branch: refs/heads/branch-2.5
Commit: 3db6bbc5ab3652c16209845ea675a90ac1c24c9c
Parents: 27b3221
Author: Miklos Gergely <mgergely@hortonworks.com>
Authored: Fri Apr 21 13:40:48 2017 +0200
Committer: Miklos Gergely <mgergely@hortonworks.com>
Committed: Fri Apr 21 13:40:48 2017 +0200

----------------------------------------------------------------------
 .../LOGSEARCH/0.5.0/package/scripts/service_check.py        | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/3db6bbc5/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/service_check.py
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/service_check.py
index c81268c..b794036 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/service_check.py
+++ b/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


Mime
View raw message