Repository: ambari Updated Branches: refs/heads/branch-2.5 86937ac57 -> f07f2f811
AMBARI-18345. 'Stack advisor' validation code reports error while trying to access 'yarn.nodemanager.resource.memory-mb' config. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f07f2f81 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f07f2f81 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f07f2f81 Branch: refs/heads/branch-2.5 Commit: f07f2f81133be1528d29c1689fb6a81fa0345625 Parents: 86937ac Author: Swapan Shridhar <sshrid...@hortonworks.com> Authored: Thu Sep 8 13:00:35 2016 -0700 Committer: Swapan Shridhar <sshrid...@hortonworks.com> Committed: Tue Sep 13 16:38:05 2016 -0700 ---------------------------------------------------------------------- .../resources/stacks/HDP/2.5/services/stack_advisor.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f07f2f81/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 1f44229..75b2f3f 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 @@ -256,13 +256,13 @@ class HDP25StackAdvisor(HDP24StackAdvisor): MIN_ASSUMED_CAP_REQUIRED_FOR_SERVICE_CHECKS = 512 current_selected_queue_for_llap_cap = None - # Get total cluster capacity - node_manager_host_list = self.get_node_manager_hosts(services, hosts) - node_manager_cnt = len(node_manager_host_list) - yarn_nm_mem_in_mb = self.get_yarn_nm_mem_in_mb(services, configurations) - total_cluster_capacity = node_manager_cnt * yarn_nm_mem_in_mb - if len(hsi_hosts) > 0: + # Get total cluster capacity + node_manager_host_list = self.get_node_manager_hosts(services, hosts) + node_manager_cnt = len(node_manager_host_list) + yarn_nm_mem_in_mb = self.get_yarn_nm_mem_in_mb(services, configurations) + total_cluster_capacity = node_manager_cnt * yarn_nm_mem_in_mb + capacity_scheduler_properties, received_as_key_value_pair = self.getCapacitySchedulerProperties(services) if capacity_scheduler_properties: if self.HIVE_INTERACTIVE_SITE in services['configurations'] and \
