You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2017/04/24 12:01:31 UTC
[16/50] [abbrv] ambari git commit: AMBARI-20798 Do not run Log Search
service check if there is no portal in the cluster. (mgergely)
AMBARI-20798 Do not run Log Search service check if there is no portal in the cluster. (mgergely)
Change-Id: I98e176ce49cde3943c7ece2dce4b20bad07d4da9
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9f113f96
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9f113f96
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9f113f96
Branch: refs/heads/branch-3.0-perf
Commit: 9f113f96cedabc49d51be62f90460a91fb57d1c6
Parents: 7b61d0c
Author: Miklos Gergely <mg...@hortonworks.com>
Authored: Fri Apr 21 13:39:14 2017 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon Apr 24 14:59:56 2017 +0300
----------------------------------------------------------------------
.../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/9f113f96/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