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/a94abb10 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a94abb10 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a94abb10 Branch: refs/heads/branch-feature-AMBARI-12556 Commit: a94abb109bfb590fe3f38b0f8efcd57c84fa4173 Parents: bbd86dd Author: Miklos Gergely <mgerg...@hortonworks.com> Authored: Fri Apr 21 13:39:14 2017 +0200 Committer: Miklos Gergely <mgerg...@hortonworks.com> Committed: Fri Apr 21 13:39:14 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/a94abb10/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