ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gau...@apache.org
Subject [1/2] ambari git commit: AMBARI-16727 Add sleep time after stop of Ranger Admin for better handling of EU
Date Thu, 19 May 2016 12:19:47 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 c4a9bba3c -> a1a98ac8d
  refs/heads/trunk 8ee7ddbb9 -> 6e44c8d98


AMBARI-16727 Add sleep time after stop of Ranger Admin for better handling of EU


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

Branch: refs/heads/trunk
Commit: 6e44c8d981d60c66ec50ffbaa331dd643c1bb97a
Parents: 8ee7ddb
Author: Gautam Borad <gautam@apache.org>
Authored: Thu May 19 16:41:49 2016 +0530
Committer: Gautam Borad <gautam@apache.org>
Committed: Thu May 19 17:48:38 2016 +0530

----------------------------------------------------------------------
 .../python/resource_management/libraries/script/script.py     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/6e44c8d9/ambari-common/src/main/python/resource_management/libraries/script/script.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/script/script.py
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
index eca7825..0dcbea8 100644
--- a/ambari-common/src/main/python/resource_management/libraries/script/script.py
+++ b/ambari-common/src/main/python/resource_management/libraries/script/script.py
@@ -657,9 +657,10 @@ class Script(object):
 
       service_name = config['serviceName'] if config is not None and 'serviceName' in config
else None
       try:
-        #TODO Once the logic for pid is available from Ranger code, will remove the below
if block.
-        if service_name == 'RANGER' and service_name is not None:
-          Logger.info('Temporary Skipping status check for RANGER service only.')
+        #TODO Once the logic for pid is available from Ranger and Ranger KMS code, will remove
the below if block.
+        services_to_skip = ['RANGER', 'RANGER_KMS']
+        if service_name in services_to_skip:
+          Logger.info('Temporarily skipping status check for {0} service only.'.format(service_name))
         else:
           self.status(env)
           raise Fail("Stop command finished but process keep running.")


Mime
View raw message