Repository: ambari Updated Branches: refs/heads/branch-2.5 7794d1326 -> e6e56e8ba
AMBARI-20431. Increase the calculated AM size for llap (sseth via smohanty) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e6e56e8b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e6e56e8b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e6e56e8b Branch: refs/heads/branch-2.5 Commit: e6e56e8bad617c65997c31773338bb176169b4a2 Parents: 7794d13 Author: Sumit Mohanty <[email protected]> Authored: Mon Mar 13 16:10:48 2017 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Mon Mar 13 16:10:48 2017 -0700 ---------------------------------------------------------------------- .../stacks/HDP/2.5/services/stack_advisor.py | 8 ++++---- .../python/stacks/2.5/common/test_stack_advisor.py | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e6e56e8b/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 a789a72..d510e60 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 @@ -1504,10 +1504,10 @@ class HDP25StackAdvisor(HDP24StackAdvisor): if is_cluster_create_opr or enable_hive_interactive_1st_invocation: if total_cluster_capacity <= 4096: calculated_tez_am_resource_memory_mb = 256 - elif total_cluster_capacity > 4096 and total_cluster_capacity <= 73728: - calculated_tez_am_resource_memory_mb = 512 - elif total_cluster_capacity > 73728: - calculated_tez_am_resource_memory_mb = 1536 + elif total_cluster_capacity > 4096 and total_cluster_capacity <= 98304: + calculated_tez_am_resource_memory_mb = 1024 + elif total_cluster_capacity > 98304: + calculated_tez_am_resource_memory_mb = 4096 Logger.info("DBG: Calculated and returning 'tez_am_resource_memory_mb' as : {0}".format(calculated_tez_am_resource_memory_mb)) return float(calculated_tez_am_resource_memory_mb) http://git-wip-us.apache.org/repos/asf/ambari/blob/e6e56e8b/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 470c4d3..2f81395 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 @@ -2007,12 +2007,12 @@ class TestHDP25StackAdvisor(TestCase): self.assertTrue('num_llap_nodes' not in configurations['hive-interactive-env']['properties']) self.assertTrue(configurations['hive-interactive-env']['properties']['num_llap_nodes_for_llap_daemons'], 3) - self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'], '11253') + self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'], '10571') self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.num.executors'], '3') self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.threadpool.size'], '3') - self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'], '2037') + self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'], '1355') self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.enabled'], 'true') self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'], '7372') @@ -2023,7 +2023,7 @@ class TestHDP25StackAdvisor(TestCase): self.assertEqual(configurations['hive-interactive-site']['properties']['hive.server2.tez.default.queues'], 'llap') self.assertEqual(configurations['hive-interactive-site']['properties']['hive.auto.convert.join.noconditionaltask.size'], '858783744') - self.assertEqual(configurations['tez-interactive-site']['properties']['tez.am.resource.memory.mb'], '682') + self.assertEqual(configurations['tez-interactive-site']['properties']['tez.am.resource.memory.mb'], '1364') self.assertEquals(configurations['hive-interactive-site']['property_attributes']['hive.llap.daemon.queue.name'], {'entries': [{'value': 'default', 'label': 'default'}, {'value': 'llap', 'label': 'llap'}]}) @@ -2815,12 +2815,12 @@ class TestHDP25StackAdvisor(TestCase): self.assertTrue('num_llap_nodes_for_llap_daemons' not in configurations['hive-interactive-env']['properties']) self.assertTrue('num_llap_nodes' not in configurations['hive-interactive-env']['properties']) - self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'], '202554') + self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'], '199826') self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.num.executors'], '10') self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.threadpool.size'], '10') - self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'], '161594') + self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'], '158866') self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.enabled'], 'true') self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'], '34816') @@ -2831,7 +2831,7 @@ class TestHDP25StackAdvisor(TestCase): self.assertEqual(configurations['hive-interactive-site']['properties']['hive.server2.tez.default.queues'], 'llap') self.assertEqual(configurations['hive-interactive-site']['properties']['hive.auto.convert.join.noconditionaltask.size'], '1145044992') - self.assertEqual(configurations['tez-interactive-site']['properties']['tez.am.resource.memory.mb'], '1705') + self.assertEqual(configurations['tez-interactive-site']['properties']['tez.am.resource.memory.mb'], '4433') self.assertEquals(configurations['hive-interactive-site']['property_attributes']['hive.llap.daemon.queue.name'], {'entries': [{'value': 'default', 'label': 'default'}, {'value': 'llap', 'label': 'llap'}]}) @@ -3852,7 +3852,7 @@ class TestHDP25StackAdvisor(TestCase): {'maximum': '1', 'minimum': '1', 'read_only': 'false'}) self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.threadpool.size'], '3') - self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'], '188416') + self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'], '186368') self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'], '9830')
