You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2015/06/16 01:55:42 UTC
ambari git commit: AMBARI-11888. Enable kerberos,
add service prompts to change Hive configs (Emil Anca via rlevas)
Repository: ambari
Updated Branches:
refs/heads/trunk 61e339211 -> 776a45d2a
AMBARI-11888. Enable kerberos, add service prompts to change Hive configs (Emil Anca via rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/776a45d2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/776a45d2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/776a45d2
Branch: refs/heads/trunk
Commit: 776a45d2a90a773adc41e3988176e141d6213efc
Parents: 61e3392
Author: Emil Anca <ea...@hortonworks.com>
Authored: Mon Jun 15 19:55:32 2015 -0400
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Mon Jun 15 19:55:37 2015 -0400
----------------------------------------------------------------------
.../main/resources/stacks/HDP/2.2/services/stack_advisor.py | 7 ++++---
.../src/test/python/stacks/2.2/common/test_stack_advisor.py | 9 +++++++--
.../src/test/python/stacks/2.3/common/test_stack_advisor.py | 1 -
3 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/776a45d2/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
index 5b15d76..17ae78b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
@@ -363,12 +363,13 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
# Security
putHiveEnvProperty("hive_security_authorization", "None")
# hive_security_authorization == 'none'
+ # this property is unrelated to Kerberos
if str(configurations["hive-env"]["properties"]["hive_security_authorization"]).lower() == "none":
- putHiveSiteProperty("hive.security.authorization.enabled", "false")
putHiveSiteProperty("hive.security.authorization.manager", "org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdConfOnlyAuthorizerFactory")
putHiveServerPropertyAttribute("hive.security.authorization.manager", "delete", "true")
- putHiveServerPropertyAttribute("hive.security.authorization.enabled", "delete", "true")
putHiveServerPropertyAttribute("hive.security.authenticator.manager", "delete", "true")
+ if "KERBEROS" not in servicesList: # Kerberos security depends on this property
+ putHiveSiteProperty("hive.security.authorization.enabled", "false")
else:
putHiveSiteProperty("hive.security.authorization.enabled", "true")
@@ -423,7 +424,7 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
if hive_server2_auth == "kerberos":
putHiveSiteProperty("hive.server2.authentication.kerberos.keytab", "")
putHiveSiteProperty("hive.server2.authentication.kerberos.principal", "")
- else:
+ elif "KERBEROS" not in servicesList: # Since 'hive_server2_auth' cannot be relied on within the default, empty recommendations request
putHiveSitePropertyAttribute("hive.server2.authentication.kerberos.keytab", "delete", "true")
putHiveSitePropertyAttribute("hive.server2.authentication.kerberos.principal", "delete", "true")
http://git-wip-us.apache.org/repos/asf/ambari/blob/776a45d2/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
index ab0aa17..e242fce 100644
--- a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
@@ -931,6 +931,11 @@ class TestHDP22StackAdvisor(TestCase):
"properties": {
"yarn.scheduler.capacity.root.queues": "queue1,queue2"
}
+ },
+ "hive-site": {
+ "properties": {
+ "hive.server2.authentication": "none"
+ }
}
}
clusterData = {
@@ -1001,7 +1006,8 @@ class TestHDP22StackAdvisor(TestCase):
'hive.vectorized.execution.enabled': 'true',
'hive.vectorized.execution.reduce.enabled': 'false',
'hive.security.metastore.authorization.manager': 'org.apache.hadoop.hive.ql.security.authorization.StorageBasedAuthorizationProvider',
- 'hive.security.authorization.manager': 'org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdConfOnlyAuthorizerFactory'
+ 'hive.security.authorization.manager': 'org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdConfOnlyAuthorizerFactory',
+ "hive.server2.authentication": "none"
},
'property_attributes': {
'hive.auto.convert.join.noconditionaltask.size': {'maximum': '805306368'},
@@ -1021,7 +1027,6 @@ class TestHDP22StackAdvisor(TestCase):
},
'property_attributes': {
'hive.security.authorization.manager': {'delete': 'true'},
- 'hive.security.authorization.enabled': {'delete': 'true'},
'hive.security.authenticator.manager': {'delete': 'true'}
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/776a45d2/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py
index 3089dfa..2f73f18 100644
--- a/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py
@@ -340,7 +340,6 @@ class TestHDP23StackAdvisor(TestCase):
},
'property_attributes': {
'hive.security.authorization.manager': {'delete': 'true'},
- 'hive.security.authorization.enabled': {'delete': 'true'},
'hive.security.authenticator.manager': {'delete': 'true'}
}
}