Revert "AMBARI-22258. Use correct property attribute setter fn(). while setting 'tez.runtime.io.sort.mb' maximum value."
This reverts commit b9f26708dd19c444918ea9b21150f66236fcdf2d. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/37d59f28 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/37d59f28 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/37d59f28 Branch: refs/heads/feature-branch-AMBARI-21307 Commit: 37d59f281e682c17e0a34aa7e6d9a09c927febca Parents: c9c96cd Author: Swapan Shridhar <sshrid...@hortonworks.com> Authored: Wed Oct 18 11:15:12 2017 -0700 Committer: Swapan Shridhar <sshrid...@hortonworks.com> Committed: Wed Oct 18 11:15:12 2017 -0700 ---------------------------------------------------------------------- .../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, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/37d59f28/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 b6f2478..92ce9b9 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 @@ -860,7 +860,6 @@ 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 @@ -1332,7 +1331,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": - putTezInteractiveSitePropertyAttribute("tez.runtime.io.sort.mb", "maximum", 1800) + putTezInteractiveSiteProperty("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/37d59f28/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 407e78d..cf462de 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,8 +4446,7 @@ class TestHDP25StackAdvisor(TestCase): }, "tez-site": { "properties": { - "tez.am.resource.memory.mb": "1024", - "tez.runtime.sorter.class": "LEGACY" + "tez.am.resource.memory.mb": "1024" } }, } @@ -4482,8 +4481,6 @@ 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'})
