Repository: ambari Updated Branches: refs/heads/trunk 111bc4dfe -> 95157fadb
AMBARI-11272 - Ranger Service Checks are failing due missing (Selvamohan Neethiraj via jonathanhurley) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/95157fad Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/95157fad Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/95157fad Branch: refs/heads/trunk Commit: 95157fadbed1a8895cd90a4b83c9a9032f3a9a15 Parents: 111bc4d Author: Jonathan Hurley <jhur...@hortonworks.com> Authored: Wed May 20 12:22:39 2015 -0400 Committer: Jonathan Hurley <jhur...@hortonworks.com> Committed: Wed May 20 12:22:58 2015 -0400 ---------------------------------------------------------------------- .../RANGER/0.4.0/package/scripts/service_check.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/95157fad/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/service_check.py index 70884f6..0a2f5ae 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/service_check.py +++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/service_check.py @@ -39,11 +39,10 @@ class RangerServiceCheck(Script): Logger.info('Ranger admin process up and running') else: if (self.is_ru_rangeradmin_in_progress()): - Logger.info('Ranger admin process not running - skipping as rolling upgrade is in progress') - else - Logger.debug('Ranger admin process not running') - raise ComponentIsNotRunning() - pass + Logger.info('Ranger admin process not running - skipping as rolling upgrade is in progress') + else: + Logger.debug('Ranger admin process not running') + raise ComponentIsNotRunning() def check_ranger_usersync_service(self): @@ -54,7 +53,6 @@ class RangerServiceCheck(Script): else: Logger.debug('Ranger usersync process not running') raise ComponentIsNotRunning() - pass def is_ru_rangeradmin_in_progress(self): return os.path.isfile(RangerServiceCheck.upgrade_marker_file)
