Repository: ambari Updated Branches: refs/heads/trunk 44bfa35db -> d7e8a7969
AMBARI-10979. MRv2 Config Screen allows me to allocate sort buffers larger than heap. (srimanth) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d7e8a796 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d7e8a796 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d7e8a796 Branch: refs/heads/trunk Commit: d7e8a796916e264222eb44672fd65619dcb2108c Parents: 44bfa35 Author: Srimanth Gunturi <[email protected]> Authored: Wed May 6 14:00:12 2015 -0700 Committer: Srimanth Gunturi <[email protected]> Committed: Wed May 6 14:00:12 2015 -0700 ---------------------------------------------------------------------- .../src/main/resources/stacks/HDP/2.2/services/stack_advisor.py | 5 +++-- .../src/test/python/stacks/2.2/common/test_stack_advisor.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d7e8a796/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py index 53f278b..89e9ae7 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py @@ -526,9 +526,10 @@ class HDP22StackAdvisor(HDP21StackAdvisor): putMapredProperty('yarn.app.mapreduce.am.command-opts', "-Xmx" + str(int(0.8 * int(configurations["mapred-site"]["properties"]["yarn.app.mapreduce.am.resource.mb"]))) + "m" + " -Dhdp.version=${hdp.version}") putMapredProperty('mapreduce.map.memory.mb', int(configurations["yarn-site"]["properties"]["yarn.scheduler.minimum-allocation-mb"])) putMapredProperty('mapreduce.reduce.memory.mb', min(2*int(configurations["yarn-site"]["properties"]["yarn.scheduler.minimum-allocation-mb"]), int(nodemanagerMinRam))) - putMapredProperty('mapreduce.map.java.opts', "-Xmx" + str(int(0.8*int(configurations["mapred-site"]["properties"]["mapreduce.map.memory.mb"]))) + "m") + mapredMapXmx = int(0.8*int(configurations["mapred-site"]["properties"]["mapreduce.map.memory.mb"])); + putMapredProperty('mapreduce.map.java.opts', "-Xmx" + str(mapredMapXmx) + "m") putMapredProperty('mapreduce.reduce.java.opts', "-Xmx" + str(int(0.8*int(configurations["mapred-site"]["properties"]["mapreduce.reduce.memory.mb"]))) + "m") - putMapredProperty('mapreduce.task.io.sort.mb', str(min(int(0.7*int(configurations["mapred-site"]["properties"]["mapreduce.map.memory.mb"])), 2047))) + putMapredProperty('mapreduce.task.io.sort.mb', str(min(int(0.7*mapredMapXmx), 2047))) # Property Attributes putMapredPropertyAttribute = self.putPropertyAttribute(configurations, "mapred-site") yarnMinAllocationSize = int(configurations["yarn-site"]["properties"]["yarn.scheduler.minimum-allocation-mb"]) http://git-wip-us.apache.org/repos/asf/ambari/blob/d7e8a796/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py index 46edea4..41ee352 100644 --- a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py +++ b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py @@ -1109,7 +1109,7 @@ class TestHDP22StackAdvisor(TestCase): "mapreduce.reduce.java.opts": "-Xmx160m", "yarn.app.mapreduce.am.resource.mb": "100", "mapreduce.map.java.opts": "-Xmx80m", - "mapreduce.task.io.sort.mb": "70" + "mapreduce.task.io.sort.mb": "56" }, "property_attributes": { 'mapreduce.task.io.sort.mb': {'maximum': '2047'},
