You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2015/11/25 21:08:08 UTC
ambari git commit: AMBARI-14059. AMS config properties may get used
before trailing m (unit) is stripped (Aravindan Vijayan via smohanty)
Repository: ambari
Updated Branches:
refs/heads/trunk ebba6caec -> cc3d1b83c
AMBARI-14059. AMS config properties may get used before trailing m (unit) is stripped (Aravindan Vijayan via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cc3d1b83
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cc3d1b83
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cc3d1b83
Branch: refs/heads/trunk
Commit: cc3d1b83ce31727e8b7335584bc8351fd55678d9
Parents: ebba6ca
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Wed Nov 25 12:07:39 2015 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Wed Nov 25 12:07:39 2015 -0800
----------------------------------------------------------------------
.../AMBARI_METRICS/0.1.0/package/scripts/params.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/cc3d1b83/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
index cc69148..85e9cb3 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
@@ -98,6 +98,10 @@ hbase_classpath_additional = default("/configurations/ams-hbase-env/hbase_classp
master_heapsize = config['configurations']['ams-hbase-env']['hbase_master_heapsize']
regionserver_heapsize = config['configurations']['ams-hbase-env']['hbase_regionserver_heapsize']
+# Check if hbase java options already have appended "m". If Yes, remove the trailing m.
+master_heapsize = int(trim_heap_property(str(master_heapsize), "m"))
+regionserver_heapsize = int(trim_heap_property(str(regionserver_heapsize), "m"))
+
regionserver_xmn_max = default('/configurations/ams-hbase-env/hbase_regionserver_xmn_max', None)
if regionserver_xmn_max:
regionserver_xmn_percent = config['configurations']['ams-hbase-env']['hbase_regionserver_xmn_ratio']
@@ -110,8 +114,6 @@ hbase_master_xmn_size = config['configurations']['ams-hbase-env']['hbase_master_
hbase_master_maxperm_size = config['configurations']['ams-hbase-env']['hbase_master_maxperm_size']
# Check if hbase java options already have appended "m". If Yes, remove the trailing m.
-master_heapsize = int(trim_heap_property(str(master_heapsize), "m"))
-regionserver_heapsize = int(trim_heap_property(str(regionserver_heapsize), "m"))
hbase_master_maxperm_size = int(trim_heap_property(str(hbase_master_maxperm_size), "m"))
hbase_master_xmn_size = int(trim_heap_property(str(hbase_master_xmn_size), "m"))
regionserver_xmn_size = int(trim_heap_property(str(regionserver_xmn_size), "m"))