Repository: ambari Updated Branches: refs/heads/trunk 8661bdf06 -> f259fd1d0
http://git-wip-us.apache.org/repos/asf/ambari/blob/f259fd1d/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/themes/theme.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/themes/theme.json b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/themes/theme.json index 98c9cde..c810f6d 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/themes/theme.json +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/themes/theme.json @@ -196,15 +196,15 @@ "subsection-name": "optimization-row1-col3" }, { - "config": "hive-site/hive.server2.tez.default.queues", + "config": "hiveserver2-site/hive.server2.tez.default.queues", "subsection-name": "interactive-query-row1-col1" }, { - "config": "hive-site/hive.server2.tez.initialize.default.sessions", + "config": "hiveserver2-site/hive.server2.tez.initialize.default.sessions", "subsection-name": "interactive-query-row1-col1" }, { - "config": "hive-site/hive.server2.tez.sessions.per.default.queue", + "config": "hiveserver2-site/hive.server2.tez.sessions.per.default.queue", "subsection-name": "interactive-query-row1-col1" }, { @@ -216,7 +216,7 @@ "subsection-name": "security-row1-col1" }, { - "config": "hive-site/hive.server2.enable.doAs", + "config": "hiveserver2-site/hive.server2.enable.doAs", "subsection-name": "security-row1-col1" }, { @@ -345,13 +345,13 @@ } }, { - "config": "hive-site/hive.server2.tez.initialize.default.sessions", + "config": "hiveserver2-site/hive.server2.tez.initialize.default.sessions", "widget": { "type": "toggle" } }, { - "config": "hive-site/hive.server2.tez.sessions.per.default.queue", + "config": "hiveserver2-site/hive.server2.tez.sessions.per.default.queue", "widget": { "type": "slider", "units": [ @@ -362,7 +362,7 @@ } }, { - "config": "hive-site/hive.server2.enable.doAs", + "config": "hiveserver2-site/hive.server2.enable.doAs", "widget": { "type": "toggle" } @@ -397,7 +397,7 @@ } }, { - "config": "hive-site/hive.server2.tez.default.queues", + "config": "hiveserver2-site/hive.server2.tez.default.queues", "widget": { "type": "list" } http://git-wip-us.apache.org/repos/asf/ambari/blob/f259fd1d/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/stack_advisor.py index 3a81f2a..a46d230 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/stack_advisor.py +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/stack_advisor.py @@ -371,68 +371,49 @@ class HDPWIN22StackAdvisor(HDPWIN21StackAdvisor): putHiveSiteProperty("hive.compute.query.using.stats", "true") # Interactive Query - putHiveSiteProperty("hive.server2.tez.initialize.default.sessions", "false") - putHiveSiteProperty("hive.server2.tez.sessions.per.default.queue", "1") - putHiveSiteProperty("hive.server2.enable.doAs", "true") + putHiveServerProperty("hive.server2.tez.initialize.default.sessions", "false") + putHiveServerProperty("hive.server2.tez.sessions.per.default.queue", "1") + putHiveServerProperty("hive.server2.enable.doAs", "true") putHiveServerProperty("tez.session.am.dag.submit.timeout.secs", "600") yarn_queues = "default" if "capacity-scheduler" in configurations and \ "yarn.scheduler.capacity.root.queues" in configurations["capacity-scheduler"]["properties"]: yarn_queues = str(configurations["capacity-scheduler"]["properties"]["yarn.scheduler.capacity.root.queues"]) - putHiveSiteProperty("hive.server2.tez.default.queues", yarn_queues) + putHiveServerProperty("hive.server2.tez.default.queues", yarn_queues) # Interactive Queues property attributes putHiveServerPropertyAttribute = self.putPropertyAttribute(configurations, "hiveserver2-site") entries = [] for queue in yarn_queues.split(","): entries.append({"label": str(queue) + " queue", "value": queue}) - putHiveSitePropertyAttribute("hive.server2.tez.default.queues", "entries", entries) + putHiveServerPropertyAttribute("hive.server2.tez.default.queues", "entries", entries) # Security putHiveEnvProperty("hive_security_authorization", "None") - # hive_security_authorization == 'none' 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") else: putHiveSiteProperty("hive.security.authorization.enabled", "true") try: auth_manager_value = str(configurations["hive-env"]["properties"]["hive.security.metastore.authorization.manager"]) except KeyError: - auth_manager_value = 'org.apache.hadoop.hive.ql.security.authorization.StorageBasedAuthorizationProvider' + auth_manager_value = '' pass - auth_manager_values = auth_manager_value.split(",") sqlstdauth_class = "org.apache.hadoop.hive.ql.security.authorization.MetaStoreAuthzAPIAuthorizerEmbedOnly" - putHiveSiteProperty("hive.server2.enable.doAs", "true") - - # hive_security_authorization == 'sqlstdauth' if str(configurations["hive-env"]["properties"]["hive_security_authorization"]).lower() == "sqlstdauth": - putHiveSiteProperty("hive.server2.enable.doAs", "false") - putHiveServerProperty("hive.security.authorization.enabled", "true") - putHiveServerProperty("hive.security.authorization.manager", "org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory") - putHiveServerProperty("hive.security.authenticator.manager", "org.apache.hadoop.hive.ql.security.SessionStateUserAuthenticator") - putHiveSiteProperty("hive.security.authorization.manager", "org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdConfOnlyAuthorizerFactory") - if sqlstdauth_class not in auth_manager_values: - auth_manager_values.append(sqlstdauth_class) - elif sqlstdauth_class in auth_manager_values: + if sqlstdauth_class not in auth_manager_value: + putHiveSiteProperty("hive.security.metastore.authorization.manager", auth_manager_value + "," + sqlstdauth_class) + elif auth_manager_value != '': #remove item from csv + auth_manager_values = auth_manager_value.split(",") auth_manager_values = [x for x in auth_manager_values if x != sqlstdauth_class] + putHiveSiteProperty("hive.security.metastore.authorization.manager", ",".join(auth_manager_values)) pass - putHiveSiteProperty("hive.security.metastore.authorization.manager", ",".join(auth_manager_values)) - - # hive_security_authorization == 'ranger' - if str(configurations["hive-env"]["properties"]["hive_security_authorization"]).lower() == "ranger": - putHiveSiteProperty("hive.server2.enable.doAs", "false") - putHiveServerProperty("hive.security.authorization.enabled", "true") - putHiveServerProperty("hive.security.authorization.manager", "org.apache.ranger.authorization.hive.authorizer.RangerHiveAuthorizerFactory") - putHiveServerProperty("hive.security.authenticator.manager", "org.apache.hadoop.hive.ql.security.SessionStateUserAuthenticator") + putHiveServerProperty("hive.server2.enable.doAs", "true") putHiveSiteProperty("hive.server2.use.SSL", "false") #Hive authentication http://git-wip-us.apache.org/repos/asf/ambari/blob/f259fd1d/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 8d462d4..04d6ef1 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 @@ -961,10 +961,6 @@ class TestHDP22StackAdvisor(TestCase): }, 'hive-site': { 'properties': { - 'hive.server2.enable.doAs': 'true', - 'hive.server2.tez.default.queues': "queue1,queue2", - 'hive.server2.tez.initialize.default.sessions': 'false', - 'hive.server2.tez.sessions.per.default.queue': '1', 'hive.auto.convert.join.noconditionaltask.size': '268435456', 'hive.cbo.enable': 'true', 'hive.compactor.initiator.on': 'false', @@ -996,9 +992,7 @@ class TestHDP22StackAdvisor(TestCase): 'hive.tez.java.opts': '-server -Xmx615m -Djava.net.preferIPv4Stack=true -XX:NewRatio=8 -XX:+UseNUMA -XX:+UseParallelGC -XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps', 'hive.txn.manager': 'org.apache.hadoop.hive.ql.lockmgr.DummyTxnManager', '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.vectorized.execution.reduce.enabled': 'false' }, 'property_attributes': { 'hive.auto.convert.join.noconditionaltask.size': {'maximum': '805306368'}, @@ -1007,22 +1001,23 @@ class TestHDP22StackAdvisor(TestCase): 'hive.server2.authentication.ldap.baseDN': {'delete': 'true'}, 'hive.server2.authentication.kerberos.principal': {'delete': 'true'}, 'hive.server2.authentication.kerberos.keytab': {'delete': 'true'}, - 'hive.server2.authentication.ldap.url': {'delete': 'true'}, - 'hive.server2.tez.default.queues': { - 'entries': [{'value': 'queue1', 'label': 'queue1 queue'}, {'value': 'queue2', 'label': 'queue2 queue'}] - } + 'hive.server2.authentication.ldap.url': {'delete': 'true'} } }, 'hiveserver2-site': { 'properties': { + 'hive.server2.enable.doAs': 'true', + 'hive.server2.tez.default.queues': "queue1,queue2", + 'hive.server2.tez.initialize.default.sessions': 'false', + 'hive.server2.tez.sessions.per.default.queue': '1', 'tez.session.am.dag.submit.timeout.secs': '600' }, 'property_attributes': { - 'hive.security.authorization.manager': {'delete': 'true'}, - 'hive.security.authorization.enabled': {'delete': 'true'}, - 'hive.security.authenticator.manager': {'delete': 'true'} + 'hive.server2.tez.default.queues': { + 'entries': [{'value': 'queue1', 'label': 'queue1 queue'}, {'value': 'queue2', 'label': 'queue2 queue'}] + } } - } + }, } services = { "services": [ @@ -1153,12 +1148,9 @@ class TestHDP22StackAdvisor(TestCase): expected["hive-site"]["properties"]["hive.stats.fetch.partition.stats"]="false" expected["hive-site"]["properties"]["hive.stats.fetch.column.stats"]="false" expected["hive-site"]["properties"]["hive.security.authorization.enabled"]="true" - expected["hive-site"]["properties"]["hive.server2.enable.doAs"]="false" + expected["hiveserver2-site"]["properties"]["hive.server2.enable.doAs"]="false" expected["hive-site"]["properties"]["hive.security.metastore.authorization.manager"]=\ - "org.apache.hadoop.hive.ql.security.authorization.StorageBasedAuthorizationProvider,org.apache.hadoop.hive.ql.security.authorization.MetaStoreAuthzAPIAuthorizerEmbedOnly" - expected["hiveserver2-site"]["properties"]["hive.security.authorization.enabled"]="true" - expected["hiveserver2-site"]["properties"]["hive.security.authorization.manager"]="org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory" - expected["hiveserver2-site"]["properties"]["hive.security.authenticator.manager"]="org.apache.hadoop.hive.ql.security.SessionStateUserAuthenticator" + ",org.apache.hadoop.hive.ql.security.authorization.MetaStoreAuthzAPIAuthorizerEmbedOnly" self.stackAdvisor.recommendHIVEConfigurations(configurations, clusterData, services, hosts) self.assertEquals(configurations, expected) @@ -1168,9 +1160,7 @@ class TestHDP22StackAdvisor(TestCase): configurations["hive-env"]["properties"]["hive_security_authorization"] = "none" expected["hive-env"]["properties"]["hive_security_authorization"] = "none" expected["hive-site"]["properties"]["hive.security.authorization.enabled"]="false" - expected["hive-site"]["properties"]["hive.server2.enable.doAs"]="true" - expected["hive-site"]["properties"]["hive.security.metastore.authorization.manager"]=\ - "org.apache.hadoop.hive.ql.security.authorization.StorageBasedAuthorizationProvider" + expected["hiveserver2-site"]["properties"]["hive.server2.enable.doAs"]="true" self.stackAdvisor.recommendHIVEConfigurations(configurations, clusterData, services, hosts) self.assertEquals(configurations, expected)
