Repository: ambari Updated Branches: refs/heads/AMBARI-2.6.0.0 [created] c8c7c4655
AMBARI-22258. Use correct property attribute setter fn(). while setting 'tez.runtime.io.sort.mb' maximum value. (cherry picked from commit 143338251ea03faae02218e27f105626b1de41a9) Change-Id: I99159dd27062289dc0e9061dc3d34f9a671a2178 Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/31b1cc34 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/31b1cc34 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/31b1cc34 Branch: refs/heads/AMBARI-2.6.0.0 Commit: 31b1cc34223c5501e5b38b20dd41cbbd1406cf34 Parents: 62ec229 Author: Swapan Shridhar <sshrid...@hortonworks.com> Authored: Wed Oct 18 13:14:49 2017 -0700 Committer: sshrid...@hortonworks.com <jenk...@hortonworks.com> Committed: Wed Oct 18 20:39:35 2017 +0000 ---------------------------------------------------------------------- .../src/main/resources/stacks/HDP/2.5/services/stack_advisor.py | 3 ++- .../src/test/python/stacks/2.5/common/test_stack_advisor.py | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/31b1cc34/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 3af05b5..a3b8263 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 @@ -861,6 +861,7 @@ class HDP25StackAdvisor(HDP24StackAdvisor): putHiveInteractiveEnvProperty = self.putProperty(configurations, "hive-interactive-env", services) putHiveInteractiveEnvPropertyAttribute = self.putPropertyAttribute(configurations, "hive-interactive-env") putTezInteractiveSiteProperty = self.putProperty(configurations, "tez-interactive-site", services) + putTezInteractiveSitePropertyAttribute = self.putPropertyAttribute(configurations, "tez-interactive-site") llap_daemon_selected_queue_name = None selected_queue_is_ambari_managed_llap = None # Queue named 'llap' at root level is Ambari managed. llap_selected_queue_am_percent = None @@ -1333,7 +1334,7 @@ class HDP25StackAdvisor(HDP24StackAdvisor): putTezInteractiveSiteProperty('tez.runtime.io.sort.mb', tez_runtime_io_sort_mb) if "tez-site" in services["configurations"] and "tez.runtime.sorter.class" in services["configurations"]["tez-site"]["properties"]: if services["configurations"]["tez-site"]["properties"]["tez.runtime.sorter.class"] == "LEGACY": - putTezInteractiveSiteProperty("tez.runtime.io.sort.mb", "maximum", 1800) + putTezInteractiveSitePropertyAttribute("tez.runtime.io.sort.mb", "maximum", 1800) putTezInteractiveSiteProperty('tez.runtime.unordered.output.buffer.size-mb', tez_runtime_unordered_output_buffer_size) putHiveInteractiveSiteProperty('hive.auto.convert.join.noconditionaltask.size', hive_auto_convert_join_noconditionaltask_size) http://git-wip-us.apache.org/repos/asf/ambari/blob/31b1cc34/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 d7ace95..bb11969 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 @@ -4446,7 +4446,8 @@ class TestHDP25StackAdvisor(TestCase): }, "tez-site": { "properties": { - "tez.am.resource.memory.mb": "1024" + "tez.am.resource.memory.mb": "1024", + "tez.runtime.sorter.class": "LEGACY" } }, } @@ -4481,6 +4482,8 @@ class TestHDP25StackAdvisor(TestCase): self.assertEqual(configurations['hive-interactive-site']['properties']['hive.llap.io.memory.size'], '186368') self.assertEqual(configurations['hive-interactive-env']['properties']['llap_heap_size'], '9830') + self.assertEqual(configurations['tez-interactive-site']['properties']['tez.runtime.io.sort.mb'], '1092') + self.assertEquals(configurations['tez-interactive-site']['property_attributes']['tez.runtime.io.sort.mb'], {'maximum': '1800'})
