ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smoha...@apache.org
Subject ambari git commit: AMBARI-19157. hive_heapsize property should not auto add m (smohanty)
Date Fri, 09 Dec 2016 21:45:57 GMT
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 <smohanty@hortonworks.com>
Authored: Fri Dec 9 13:28:00 2016 -0800
Committer: Sumit Mohanty <smohanty@hortonworks.com>
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


Mime
View raw message