Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 45B32200B92 for ; Wed, 14 Sep 2016 01:38:14 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 445AF160AD3; Tue, 13 Sep 2016 23:38:14 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 8CA56160AD2 for ; Wed, 14 Sep 2016 01:38:13 +0200 (CEST) Received: (qmail 42252 invoked by uid 500); 13 Sep 2016 23:38:12 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 42243 invoked by uid 99); 13 Sep 2016 23:38:12 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Sep 2016 23:38:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A2C8CE0120; Tue, 13 Sep 2016 23:38:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: swapan@apache.org To: commits@ambari.apache.org Message-Id: <12d04936893c46c7946fb9989ca54e72@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-18345. 'Stack advisor' validation code reports error while trying to access 'yarn.nodemanager.resource.memory-mb' config. Date: Tue, 13 Sep 2016 23:38:12 +0000 (UTC) archived-at: Tue, 13 Sep 2016 23:38:14 -0000 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 Authored: Thu Sep 8 13:00:35 2016 -0700 Committer: Swapan Shridhar 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 \