Repository: ambari Updated Branches: refs/heads/trunk e0c35f088 -> bbe591825
AMBARI-20554. Fix minimum recommended value for slider and Tez AM for HSI. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bbe59182 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bbe59182 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bbe59182 Branch: refs/heads/trunk Commit: bbe5918256b18ac22955316daa546e662a2510a0 Parents: e0c35f0 Author: Swapan Shridhar <[email protected]> Authored: Thu Mar 23 18:29:06 2017 -0700 Committer: Swapan Shridhar <[email protected]> Committed: Thu Mar 23 19:17:36 2017 -0700 ---------------------------------------------------------------------- .../YARN/3.0.0.3.0/service_advisor.py | 10 ++++------ .../stacks/HDP/2.5/services/stack_advisor.py | 10 ++++------ .../stacks/2.5/common/test_stack_advisor.py | 18 +++++++++--------- 3 files changed, 17 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/bbe59182/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/service_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/service_advisor.py b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/service_advisor.py index 6db4e71..103b934 100644 --- a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/service_advisor.py +++ b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/service_advisor.py @@ -1400,12 +1400,10 @@ yarn.scheduler.capacity.root.{0}.maximum-am-resource-percent=1""".format(llap_qu :type yarn_min_container_size int """ - if yarn_min_container_size > 1024: + if yarn_min_container_size >= 1024: return 1024 - if yarn_min_container_size >= 256 and yarn_min_container_size <= 1024: - return yarn_min_container_size - if yarn_min_container_size < 256: - return 256 + else: + return 512 def get_yarn_nm_mem_in_mb(self, services, configurations): """ @@ -1446,7 +1444,7 @@ yarn.scheduler.capacity.root.{0}.maximum-am-resource-percent=1""".format(llap_qu calculated_tez_am_resource_memory_mb = None if is_cluster_create_opr or enable_hive_interactive_1st_invocation: if total_cluster_capacity <= 4096: - calculated_tez_am_resource_memory_mb = 256 + calculated_tez_am_resource_memory_mb = 512 elif total_cluster_capacity > 4096 and total_cluster_capacity <= 98304: calculated_tez_am_resource_memory_mb = 1024 elif total_cluster_capacity > 98304: http://git-wip-us.apache.org/repos/asf/ambari/blob/bbe59182/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 a8b3728..b693f9f 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 @@ -1462,12 +1462,10 @@ class HDP25StackAdvisor(HDP24StackAdvisor): :type yarn_min_container_size int """ - if yarn_min_container_size > 1024: + if yarn_min_container_size >= 1024: return 1024 - if yarn_min_container_size >= 256 and yarn_min_container_size <= 1024: - return yarn_min_container_size - if yarn_min_container_size < 256: - return 256 + else: + return 512 def calculate_tez_am_container_size(self, services, total_cluster_capacity, is_cluster_create_opr=False, enable_hive_interactive_1st_invocation=False): """ @@ -1478,7 +1476,7 @@ class HDP25StackAdvisor(HDP24StackAdvisor): calculated_tez_am_resource_memory_mb = None if is_cluster_create_opr or enable_hive_interactive_1st_invocation: if total_cluster_capacity <= 4096: - calculated_tez_am_resource_memory_mb = 256 + calculated_tez_am_resource_memory_mb = 512 elif total_cluster_capacity > 4096 and total_cluster_capacity <= 98304: calculated_tez_am_resource_memory_mb = 1024 elif total_cluster_capacity > 98304: http://git-wip-us.apache.org/repos/asf/ambari/blob/bbe59182/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 6d4e05f..4250681 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 @@ -1401,19 +1401,19 @@ class TestHDP25StackAdvisor(TestCase): self.assertTrue(configurations['hive-interactive-env']['properties']['num_llap_nodes'], 3) 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'], '9548') + self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'], '9207') self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.num.executors'], '1') self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.threadpool.size'], '1') - self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'], '8524') + self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'], '8183') self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.enabled'], 'true') self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'], '819') self.assertEqual(configurations['hive-interactive-env']['properties']['hive_heapsize'], '2048') self.assertEqual(configurations['hive-interactive-env']['property_attributes']['num_llap_nodes'], {'read_only': 'true', 'minimum': '1', 'maximum': '1'}) - self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_mb'], '341') + self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_mb'], '682') self.assertEqual(configurations['hive-interactive-site']['properties']['hive.auto.convert.join.noconditionaltask.size'], '286261248') self.assertTrue('tez.am.resource.memory.mb' not in configurations['tez-interactive-site']['properties']) @@ -2007,19 +2007,19 @@ 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'], '10571') + self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'], '10230') 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'], '1355') + self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'], '1014') self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.enabled'], 'true') self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'], '7372') self.assertEqual(configurations['hive-interactive-env']['properties']['hive_heapsize'], '2048') self.assertEqual(configurations['hive-interactive-env']['property_attributes']['num_llap_nodes'], {'maximum': '3', 'minimum': '1', 'read_only': 'false'}) - self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_mb'], '341') + self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_mb'], '682') 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') @@ -2815,19 +2815,19 @@ 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'], '199826') + self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.daemon.yarn.container.mb'], '199485') 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'], '158866') + self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'], '158525') self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.enabled'], 'true') self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'], '34816') self.assertEqual(configurations['hive-interactive-env']['properties']['hive_heapsize'], '2048') self.assertEqual(configurations['hive-interactive-env']['property_attributes']['num_llap_nodes'], {'maximum': '5', 'minimum': '1', 'read_only': 'false'}) - self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_mb'], '341') + self.assertEqual(configurations['hive-interactive-env']['properties']['slider_am_container_mb'], '682') 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')
