You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2015/10/09 19:02:49 UTC
[2/2] ambari git commit: AMBARI-13377. External URL
(policymgr_external_ur) value in Ranger service should be recommended by
stack advisor (dlysnichenko)
AMBARI-13377. External URL (policymgr_external_ur) value in Ranger service should be recommended by stack advisor (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4191d881
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4191d881
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4191d881
Branch: refs/heads/branch-2.1
Commit: 4191d8817efa74164bdab69d8cc39622cd843753
Parents: 626a2bd
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Fri Oct 9 20:00:13 2015 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Fri Oct 9 20:02:28 2015 +0300
----------------------------------------------------------------------
.../stacks/HDP/2.0.6/services/stack_advisor.py | 35 +++++++++
.../stacks/2.0.6/common/test_stack_advisor.py | 80 ++++++++++++++++++++
2 files changed, 115 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4191d881/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
index 2ba1a5c..b4c662a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
@@ -266,6 +266,41 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
rangerSqlConnectorProperty = ranger_sql_connector_dict.get(rangerDbFlavor, ranger_sql_connector_dict['MYSQL'])
putRangerAdminProperty('SQL_CONNECTOR_JAR', rangerSqlConnectorProperty)
+ # Build policymgr_external_url
+ protocol = 'http'
+ ranger_admin_host = 'localhost'
+ port = '6080'
+
+ if 'ranger-site' in services['configurations'] and 'http.enabled' in services['configurations']['ranger-site']['properties'] \
+ and services['configurations']['ranger-site']['properties']['http.enabled'].lower() == 'false':
+ # HTTPS protocol is used
+ protocol = 'https'
+ # In HDP-2.3 port stored in ranger-admin-site ranger.service.https.port
+ if 'ranger-admin-site' in services['configurations'] and \
+ 'ranger.service.https.port' in services['configurations']['ranger-admin-site']['properties']:
+ port = services['configurations']['ranger-admin-site']['properties']['ranger.service.https.port']
+ # In HDP-2.2 port stored in ranger-site https.service.port
+ elif 'ranger-site' in services['configurations'] and \
+ 'https.service.port' in services['configurations']['ranger-site']['properties']:
+ port = services['configurations']['ranger-site']['properties']['https.service.port']
+ else:
+ # HTTP protocol is used
+ # In HDP-2.3 port stored in ranger-admin-site ranger.service.http.port
+ if 'ranger-admin-site' in services['configurations'] and \
+ 'ranger.service.http.port' in services['configurations']['ranger-admin-site']['properties']:
+ port = services['configurations']['ranger-admin-site']['properties']['ranger.service.http.port']
+ # In HDP-2.2 port stored in ranger-site http.service.port
+ elif 'ranger-site' in services['configurations'] and \
+ 'http.service.port' in services['configurations']['ranger-site']['properties']:
+ port = services['configurations']['ranger-site']['properties']['http.service.port']
+
+ ranger_admin_hosts = self.getComponentHostNames(services, "RANGER", "RANGER_ADMIN")
+ if ranger_admin_hosts:
+ ranger_admin_host = ranger_admin_hosts[0]
+
+ policymgr_external_url = "%s://%s:%s" % (protocol, ranger_admin_host, port)
+ putRangerAdminProperty('policymgr_external_url', policymgr_external_url)
+
def getAmsMemoryRecommendation(self, services, hosts):
# MB per sink in hbase heapsize
http://git-wip-us.apache.org/repos/asf/ambari/blob/4191d881/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
index 79a6edb..c016951 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/common/test_stack_advisor.py
@@ -676,6 +676,86 @@ class TestHDP206StackAdvisor(TestCase):
self.stackAdvisor.recommendHbaseConfigurations(configurations, clusterData, services, None)
self.assertEquals(configurations, expected)
+
+ def test_recommendRangerConfigurations(self):
+ clusterData = {}
+ # Recommend for not existing DB_FLAVOR and http enabled, HDP-2.3
+ services = {
+ "services": [
+ {
+ "StackServices": {
+ "service_name": "RANGER"
+ },
+ "components": [
+ {
+ "StackServiceComponents": {
+ "component_name": "RANGER_ADMIN",
+ "hostnames": ["host1"]
+ }
+ }
+ ]
+ },
+ ],
+ "configurations": {
+ "admin-properties": {
+ "properties": {
+ "DB_FLAVOR": "NOT_EXISTING",
+ }
+ },
+ "ranger-admin-site": {
+ "properties": {
+ "ranger.service.http.port": "7777",
+ }
+ },
+ "ranger-site": {
+ "properties": {
+ "http.enabled": "true",
+ }
+ }
+ }
+ }
+ expected = {
+ "admin-properties": {
+ "properties": {
+ "SQL_CONNECTOR_JAR": "/usr/share/java/mysql-connector-java.jar",
+ "policymgr_external_url": "http://host1:7777",
+ }
+ },
+ }
+ recommendedConfigurations = {}
+ self.stackAdvisor.recommendRangerConfigurations(recommendedConfigurations, clusterData, services, None)
+ self.assertEquals(recommendedConfigurations, expected)
+
+ # Recommend for DB_FLAVOR ORACLE and https enabled, HDP-2.2
+ configurations = {
+ "admin-properties": {
+ "properties": {
+ "DB_FLAVOR": "ORACLE",
+ }
+ },
+ "ranger-site": {
+ "properties": {
+ "http.enabled": "false",
+ "https.service.port": "8888",
+ }
+ }
+ }
+ services['configurations'] = configurations
+ expected = {
+ "admin-properties": {
+ "properties": {
+ "SQL_CONNECTOR_JAR": "/usr/share/java/ojdbc6.jar",
+ "policymgr_external_url": "https://host1:8888",
+ }
+ },
+ }
+
+ recommendedConfigurations = {}
+ self.stackAdvisor.recommendRangerConfigurations(recommendedConfigurations, clusterData, services, None)
+ self.assertEquals(recommendedConfigurations, expected)
+
+
+
def test_recommendHDFSConfigurations(self):
configurations = {
"hadoop-env": {