ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject ambari git commit: Revert "Revert "AMBARI-16104. HBase service check fails on an HA cluster deployed via blueprint (aonishuk)""
Date Mon, 25 Apr 2016 19:51:31 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 020b1c787 -> acfa1c0e7


Revert "Revert "AMBARI-16104. HBase service check fails on an HA cluster deployed via blueprint
(aonishuk)""

This reverts commit 020b1c7872c2fe88a19c5ed087de22db38db7ddc.


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

Branch: refs/heads/trunk
Commit: acfa1c0e7a9b8513eb74747008a43d70728e07bb
Parents: 020b1c7
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Mon Apr 25 22:51:25 2016 +0300
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Mon Apr 25 22:51:25 2016 +0300

----------------------------------------------------------------------
 .../libraries/functions/ranger_functions.py     | 23 ++++++++------------
 1 file changed, 9 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/acfa1c0e/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
b/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
index 84a03a3..40f75f7 100644
--- a/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
+++ b/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
@@ -174,8 +174,7 @@ class Rangeradmin:
           policiesUpdateCount = 0
           for policy in policyList:
             updatedPolicyObj = self.get_policy_params(typeOfPolicy, policy, policy_user)
-            policyResCode, policyResponse = self.update_ranger_policy(updatedPolicyObj['id'],
-                                                                      json.dumps(updatedPolicyObj),
usernamepassword)
+            policyResCode = self.update_ranger_policy(updatedPolicyObj['id'], json.dumps(updatedPolicyObj),
usernamepassword)
             if policyResCode == 200:
               policiesUpdateCount = policiesUpdateCount + 1
             else:
@@ -248,13 +247,11 @@ class Rangeradmin:
         return None
     except urllib2.URLError, e:
       if isinstance(e, urllib2.HTTPError):
-        Logger.error("Error getting policy from repository {0} for component {1}. Http status
code - {2}. \n {3}".format(name, component, e.code, e.read()))
+        raise Fail("Error getting policy from repository {0} for component {1}. Http status
code - {2}. \n {3}".format(name, component, e.code, e.read()))
       else:
-        Logger.error("Error getting policy from repository {0} for component {1}. Reason
- {2}.".format(name, component, e.reason))
-      return None
+        raise Fail("Error getting policy from repository {0} for component {1}. Reason -
{2}.".format(name, component, e.reason))
     except httplib.BadStatusLine:
-      Logger.error("Ranger Admin service is not reachable, please restart the service and
then try again")
-      return None
+      raise Fail("Ranger Admin service is not reachable, please restart the service and then
try again")
     except TimeoutError:
       raise Fail("Connection to Ranger Admin failed. Reason - timeout")
 
@@ -281,19 +278,17 @@ class Rangeradmin:
       response = json.loads(json.JSONEncoder().encode(result.read()))
       if response_code == 200:
         Logger.info('Policy updated Successfully')
-        return response_code, response
+        return response_code
       else:
         Logger.error('Update Policy failed')
-        return None, None
+        return None
     except urllib2.URLError, e:
       if isinstance(e, urllib2.HTTPError):
-        Logger.error("Error updating policy. Http status code - {0}. \n {1}".format(e.code,
e.read()))
+        raise Fail("Error updating policy. Http status code - {0}. \n {1}".format(e.code,
e.read()))
       else:
-        Logger.error("Error updating policy. Reason - {0}.".format(e.reason))
-      return None, None
+        raise Fail("Error updating policy. Reason - {0}.".format(e.reason))
     except httplib.BadStatusLine:
-      Logger.error("Ranger Admin service is not reachable, please restart the service and
then try again")
-      return None, None
+      raise Fail("Ranger Admin service is not reachable, please restart the service and then
try again")
     except TimeoutError:
       raise Fail("Connection to Ranger Admin failed. Reason - timeout")
 


Mime
View raw message