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-14108. AMS Collector does not start with 2.1.2 input and env scripts (Aravindan Vijayan via smohanty)
Date Sun, 29 Nov 2015 16:13:03 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 863d787b3 -> 9dc2e44f0


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/9dc2e44f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9dc2e44f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9dc2e44f

Branch: refs/heads/branch-2.1
Commit: 9dc2e44f0ad60597f175c260f926b237d2a5d6b2
Parents: 863d787
Author: Sumit Mohanty <smohanty@hortonworks.com>
Authored: Sun Nov 29 08:08:20 2015 -0800
Committer: Sumit Mohanty <smohanty@hortonworks.com>
Committed: Sun Nov 29 08:12:56 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/9dc2e44f/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:


Mime
View raw message