Repository: ambari Updated Branches: refs/heads/trunk 20a9ba189 -> f80136991
AMBARI-14108. AMS Collector does not start with 2.1.2 input and env scripts (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/f8013699 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f8013699 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f8013699 Branch: refs/heads/trunk Commit: f801369917633d357be0e59c645c9979e5686287 Parents: 20a9ba1 Author: Sumit Mohanty <[email protected]> Authored: Sun Nov 29 08:08:20 2015 -0800 Committer: Sumit Mohanty <[email protected]> Committed: Sun Nov 29 08:08:20 2015 -0800 ---------------------------------------------------------------------- .../common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f8013699/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 85e9cb3..68a3daa 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 @@ -99,11 +99,13 @@ master_heapsize = config['configurations']['ams-hbase-env']['hbase_master_heapsi 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. +metrics_collector_heapsize = int(trim_heap_property(str(metrics_collector_heapsize), "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_max = int(trim_heap_property(str(regionserver_xmn_max), "m")) regionserver_xmn_percent = config['configurations']['ams-hbase-env']['hbase_regionserver_xmn_ratio'] regionserver_xmn_size = calc_xmn_from_xms(regionserver_heapsize, regionserver_xmn_percent, regionserver_xmn_max) else:
