Repository: ambari Updated Branches: refs/heads/trunk 3a98919ee -> 402f9c73f
AMBARI-16303. HiveServer interactive fails to start Part 2 (Daniel Gergely via oleewere) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/402f9c73 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/402f9c73 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/402f9c73 Branch: refs/heads/trunk Commit: 402f9c73fe875f46356bce8c0de6eea08cb1a881 Parents: 3a98919 Author: Daniel Gergely <dgerg...@hortonworks.com> Authored: Thu May 12 15:55:52 2016 +0200 Committer: oleewere <oleew...@gmail.com> Committed: Thu May 12 15:55:52 2016 +0200 ---------------------------------------------------------------------- .../resources/stacks/HDP/2.5/services/stack_advisor.py | 2 ++ .../test/python/stacks/2.5/common/test_stack_advisor.py | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/402f9c73/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py index 3d689d7..5ae3664 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py @@ -239,6 +239,8 @@ class HDP25StackAdvisor(HDP24StackAdvisor): Logger.debug("Selected YARN queue is '{0}'. Setting LLAP queue capacity slider visibility to True".format(llap_queue_name)) else: putHiveInteractiveEnvPropertyAttribute("llap_queue_capacity", "visible", "false") + Logger.debug("Setting hive.llap.daemon.yarn.container.mb to yarn min container size (" + str(self.get_yarn_min_container_size(services)) + " MB).") + putHiveInteractiveSiteProperty('hive.llap.daemon.yarn.container.mb', long(self.get_yarn_min_container_size(services))) Logger.debug("Queue selected for LLAP app is : '{0}'. Current YARN queues : {1}. " "Setting LLAP queue capacity slider visibility to False. " "Skipping updating values for LLAP related configs".format(llap_daemon_selected_queue_name, list(leafQueueNames))) http://git-wip-us.apache.org/repos/asf/ambari/blob/402f9c73/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py index e9ddc25..fc4ebc6 100644 --- a/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py +++ b/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py @@ -2974,6 +2974,14 @@ class TestHDP25StackAdvisor(TestCase): } } + expected_hive_interactive_site_only_memory = { + "hive-interactive-site": { + "properties": { + 'hive.llap.daemon.yarn.container.mb': '341' + } + } + } + # Expected 'hive_interactive_env' with 'llap_queue_capacity' set to 20. expected_llap_queue_capacity_20 = '20' @@ -3430,7 +3438,7 @@ class TestHDP25StackAdvisor(TestCase): expected_capacity_scheduler_empty['properties']) self.assertEquals(configurations['hive-interactive-site']['properties'], - expected_hive_interactive_site_empty['hive-interactive-site']['properties']) + expected_hive_interactive_site_only_memory['hive-interactive-site']['properties']) self.assertEquals(configurations['hive-interactive-env']['properties'], expected_hive_interactive_env_empty['hive-interactive-env']['properties'])
