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 707ED200BD9 for ; Fri, 9 Dec 2016 22:45:59 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 6D44B160B1E; Fri, 9 Dec 2016 21:45:59 +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 B6734160AFD for ; Fri, 9 Dec 2016 22:45:58 +0100 (CET) Received: (qmail 74690 invoked by uid 500); 9 Dec 2016 21:45:57 -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 74681 invoked by uid 99); 9 Dec 2016 21:45:57 -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; Fri, 09 Dec 2016 21:45:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CF4FBE040F; Fri, 9 Dec 2016 21:45:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: smohanty@apache.org To: commits@ambari.apache.org Message-Id: <1d286b6f540143669287274773b32edc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-19157. hive_heapsize property should not auto add m (smohanty) Date: Fri, 9 Dec 2016 21:45:57 +0000 (UTC) archived-at: Fri, 09 Dec 2016 21:45:59 -0000 Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-18901 5410e114f -> bb8309ed0 AMBARI-19157. hive_heapsize property should not auto add m (smohanty) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bb8309ed Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bb8309ed Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bb8309ed Branch: refs/heads/branch-feature-AMBARI-18901 Commit: bb8309ed01d012e25b074e526c95e19200966b50 Parents: 5410e11 Author: Sumit Mohanty Authored: Fri Dec 9 13:28:00 2016 -0800 Committer: Sumit Mohanty Committed: Fri Dec 9 13:28:00 2016 -0800 ---------------------------------------------------------------------- .../src/main/resources/stacks/HDP/2.5/services/stack_advisor.py | 2 +- ambari-web/app/mixins/common/configs/configs_saver.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/bb8309ed/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 edd7af1..873a8bd 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 @@ -1509,7 +1509,7 @@ class HDP25StackAdvisor(HDP24StackAdvisor): hive_tez_container_size = self.get_hive_tez_container_size(services) tez_am_container_size = self.calculate_tez_am_container_size(services, long(total_cluster_cap)) normalized_val = self._normalizeUp(slider_am_size, yarn_min_container_size) + self._normalizeUp\ - (hive_tez_container_size, yarn_min_container_size) + self._normalizeUp(tez_am_container_size, yarn_min_container_size) + (long(hive_tez_container_size), yarn_min_container_size) + self._normalizeUp(tez_am_container_size, yarn_min_container_size) min_required = max(total_queue_size_at_20_perc, normalized_val) http://git-wip-us.apache.org/repos/asf/ambari/blob/bb8309ed/ambari-web/app/mixins/common/configs/configs_saver.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mixins/common/configs/configs_saver.js b/ambari-web/app/mixins/common/configs/configs_saver.js index 88b9e11..27427d0 100644 --- a/ambari-web/app/mixins/common/configs/configs_saver.js +++ b/ambari-web/app/mixins/common/configs/configs_saver.js @@ -46,7 +46,7 @@ App.ConfigsSaverMixin = Em.Mixin.create({ heapsizeException: ['hadoop_heapsize', 'yarn_heapsize', 'nodemanager_heapsize', 'resourcemanager_heapsize', 'apptimelineserver_heapsize', 'jobhistory_heapsize', 'nfsgateway_heapsize', 'accumulo_master_heapsize', 'accumulo_tserver_heapsize', 'accumulo_monitor_heapsize', 'accumulo_gc_heapsize', 'accumulo_other_heapsize', - 'hbase_master_heapsize', 'hbase_regionserver_heapsize', 'metrics_collector_heapsize'], + 'hbase_master_heapsize', 'hbase_regionserver_heapsize', 'metrics_collector_heapsize', 'hive_heapsize'], /** * Regular expression for heapsize properties detection