Repository: ambari Updated Branches: refs/heads/branch-2.5 0615883bd -> 98e37b008
AMBARI-19855 Stack advisor issues encountered (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/98e37b00 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/98e37b00 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/98e37b00 Branch: refs/heads/branch-2.5 Commit: 98e37b008c8a64703a5464d4dd3e5f8ccae4792b Parents: 0615883 Author: Dmytro Sen <[email protected]> Authored: Fri Feb 3 17:17:36 2017 +0200 Committer: Dmytro Sen <[email protected]> Committed: Fri Feb 3 17:17:36 2017 +0200 ---------------------------------------------------------------------- .../main/resources/stacks/HDP/2.2/services/stack_advisor.py | 8 ++++---- .../resources/stacks/HDPWIN/2.2/services/stack_advisor.py | 8 ++++---- .../src/test/python/stacks/2.2/common/test_stack_advisor.py | 7 ++++--- 3 files changed, 12 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/98e37b00/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 d1a76cc..0bdf319 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 @@ -87,10 +87,10 @@ class HDP22StackAdvisor(HDP21StackAdvisor): putYarnPropertyAttribute = self.putPropertyAttribute(configurations, "yarn-site") nodeManagerHost = self.getHostWithComponent("YARN", "NODEMANAGER", services, hosts) if (nodeManagerHost is not None): - cpuPercentageLimit = 0.8 - if "yarn.nodemanager.resource.percentage-physical-cpu-limit" in configurations["yarn-site"]["properties"]: - cpuPercentageLimit = float(configurations["yarn-site"]["properties"]["yarn.nodemanager.resource.percentage-physical-cpu-limit"]) - cpuLimit = max(1, int(floor(nodeManagerHost["Hosts"]["cpu_count"] * cpuPercentageLimit))) + cpuPercentageLimit = 80.0 + if "yarn-site" in services["configurations"] and "yarn.nodemanager.resource.percentage-physical-cpu-limit" in services["configurations"]["yarn-site"]["properties"]: + cpuPercentageLimit = float(services["configurations"]["yarn-site"]["properties"]["yarn.nodemanager.resource.percentage-physical-cpu-limit"]) + cpuLimit = max(1, int(floor(nodeManagerHost["Hosts"]["cpu_count"] * (cpuPercentageLimit / 100.0)))) putYarnProperty('yarn.nodemanager.resource.cpu-vcores', str(cpuLimit)) putYarnProperty('yarn.scheduler.maximum-allocation-vcores', configurations["yarn-site"]["properties"]["yarn.nodemanager.resource.cpu-vcores"]) putYarnPropertyAttribute('yarn.nodemanager.resource.memory-mb', 'maximum', int(nodeManagerHost["Hosts"]["total_mem"] / 1024)) # total_mem in kb http://git-wip-us.apache.org/repos/asf/ambari/blob/98e37b00/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/stack_advisor.py index d560146..88cc6bb 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/stack_advisor.py +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/stack_advisor.py @@ -188,10 +188,10 @@ class HDPWIN22StackAdvisor(HDPWIN21StackAdvisor): putYarnPropertyAttribute = self.putPropertyAttribute(configurations, "yarn-site") nodeManagerHost = self.getHostWithComponent("YARN", "NODEMANAGER", services, hosts) if (nodeManagerHost is not None): - cpuPercentageLimit = 0.8 - if "yarn.nodemanager.resource.percentage-physical-cpu-limit" in configurations["yarn-site"]["properties"]: - cpuPercentageLimit = float(configurations["yarn-site"]["properties"]["yarn.nodemanager.resource.percentage-physical-cpu-limit"]) - cpuLimit = max(1, int(math.floor(nodeManagerHost["Hosts"]["cpu_count"] * cpuPercentageLimit))) + cpuPercentageLimit = 80.0 + if "yarn-site" in services["configurations"] and "yarn.nodemanager.resource.percentage-physical-cpu-limit" in services["configurations"]["yarn-site"]["properties"]: + cpuPercentageLimit = float(services["configurations"]["yarn-site"]["properties"]["yarn.nodemanager.resource.percentage-physical-cpu-limit"]) + cpuLimit = max(1, int(floor(nodeManagerHost["Hosts"]["cpu_count"] * (cpuPercentageLimit / 100.0)))) putYarnProperty('yarn.nodemanager.resource.cpu-vcores', str(cpuLimit)) putYarnProperty('yarn.scheduler.maximum-allocation-vcores', configurations["yarn-site"]["properties"]["yarn.nodemanager.resource.cpu-vcores"]) putYarnPropertyAttribute('yarn.nodemanager.resource.memory-mb', 'maximum', int(nodeManagerHost["Hosts"]["total_mem"] / 1024)) # total_mem in kb http://git-wip-us.apache.org/repos/asf/ambari/blob/98e37b00/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 db71746..e2813fa 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 @@ -1152,7 +1152,7 @@ class TestHDP22StackAdvisor(TestCase): # Test host NodeManager CPU cores and 'yarn.nodemanager.resource.percentage-physical-cpu-limit' hosts["items"][2]["Hosts"]["cpu_count"] = 10 - configurations["yarn-site"]["properties"]["yarn.nodemanager.resource.percentage-physical-cpu-limit"] = '0.5' + services["configurations"]["yarn-site"]["properties"]["yarn.nodemanager.resource.percentage-physical-cpu-limit"] = '50' services["changed-configurations"].append({ "type": "yarn-site", "name": "yarn.nodemanager.resource.percentage-physical-cpu-limit", @@ -1161,7 +1161,7 @@ class TestHDP22StackAdvisor(TestCase): expected["yarn-site"]["properties"]["yarn.nodemanager.resource.cpu-vcores"] = '5' expected["yarn-site"]["properties"]["yarn.scheduler.minimum-allocation-vcores"] = '1' expected["yarn-site"]["properties"]["yarn.scheduler.maximum-allocation-vcores"] = '5' - expected["yarn-site"]["properties"]["yarn.nodemanager.resource.percentage-physical-cpu-limit"] = '0.5' + expected["yarn-site"]["properties"]["yarn.nodemanager.resource.percentage-physical-cpu-limit"] = '50' expected["yarn-site"]["property_attributes"]["yarn.nodemanager.resource.cpu-vcores"]["maximum"] = '20' expected["yarn-site"]["property_attributes"]["yarn.scheduler.minimum-allocation-vcores"]["maximum"] = '5' expected["yarn-site"]["property_attributes"]["yarn.scheduler.maximum-allocation-vcores"]["maximum"] = '5' @@ -1175,7 +1175,8 @@ class TestHDP22StackAdvisor(TestCase): "old_value": "1280" }] services.pop("configurations", None) - services["configurations"] = {"yarn-site": {"properties": {"yarn.nodemanager.resource.memory-mb": '4321'}}} + services["configurations"] = {"yarn-site": {"properties": {"yarn.nodemanager.resource.memory-mb": '4321', + "yarn.nodemanager.resource.percentage-physical-cpu-limit" : '50'}}} expected["yarn-site"]["properties"]["yarn.nodemanager.resource.memory-mb"] = '4321' expected["yarn-site"]["properties"]["yarn.scheduler.maximum-allocation-mb"] = '4321'
