This is an automated email from the ASF dual-hosted git repository. avijayan pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git
commit dd249318ee0373117d8e1e8dee4543847d5d4d52 Author: Aravindan Vijayan <[email protected]> AuthorDate: Fri May 11 07:03:41 2018 -0700 Revert "AMBARI-23804 : Refine AMS HBase region splitting calculation based on UUID work (Pass hbase total heapsize to collector)." This reverts commit 5bae5c66268591f999e639ca32a50931d803f9f2. --- .../common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py | 4 ---- ambari-server/src/test/python/stacks/2.0.6/configs/default.json | 3 +-- .../src/test/python/stacks/2.0.6/configs/default_ams_embedded.json | 3 +-- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py index fc57ffc..d0ee66e 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py @@ -252,10 +252,6 @@ def ams(name=None, action=None): master_components.append('ambari_server') new_ams_site['timeline.metrics.initial.configured.master.components'] = ",".join(master_components) - hbase_total_heapsize_with_trailing_m = params.hbase_heapsize - hbase_total_heapsize = int(hbase_total_heapsize_with_trailing_m[:-1]) * 1024 * 1024 - new_ams_site['hbase_total_heapsize'] = hbase_total_heapsize - XmlConfig("ams-site.xml", conf_dir=params.ams_collector_conf_dir, configurations=new_ams_site, diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json index 98fc30d..69bd8d8 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json @@ -1078,8 +1078,7 @@ "timeline.metrics.cluster.aggregator.minute.interval": "120", "timeline.metrics.host.aggregator.hourly.interval": "3600", "timeline.metrics.initial.configured.master.components": "drpc_server,hive_server,resourcemanager,all,webhcat_server,snamenode,storm_ui_server,falcon_server,namenode,ganglia_server,logviewer_server,hive_metastore,nimbus,zookeeper_server,historyserver,hbase_master,oozie_server,metrics_collector,supervisor,ganglia_monitor,hive_mysql,ambari_server", - "timeline.metrics.initial.configured.slave.components": "hbase_regionserver,datanode,nodemanager", - "hbase_total_heapsize": 536870912 + "timeline.metrics.initial.configured.slave.components": "hbase_regionserver,datanode,nodemanager" }, "ams-grafana-env": { "metrics_grafana_log_dir": "/var/log/ambari-metrics-grafana", diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json index a802b74..92cd24a 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json @@ -995,8 +995,7 @@ "timeline.metrics.daily.aggregator.minute.interval": "86400", "timeline.metrics.cluster.aggregator.minute.interval": "120", "timeline.metrics.host.aggregator.hourly.interval": "3600", - "timeline.metrics.initial.configured.master.components": "snamenode,nm,drpc_server,hive_server,resourcemanager,all,slave,webhcat_server,ganglia_server,storm_ui_server,falcon_server,hs,hive_metastore,logviewer_server,nimbus,zookeeper_server,hbase_rs,namenode,hbase_master,metrics_collector,ambari_server,supervisor,ganglia_monitor,hive_mysql", - "hbase_total_heapsize": 1073741824 + "timeline.metrics.initial.configured.master.components": "snamenode,nm,drpc_server,hive_server,resourcemanager,all,slave,webhcat_server,ganglia_server,storm_ui_server,falcon_server,hs,hive_metastore,logviewer_server,nimbus,zookeeper_server,hbase_rs,namenode,hbase_master,metrics_collector,ambari_server,supervisor,ganglia_monitor,hive_mysql" } }, "configurationAttributes": { -- To stop receiving notification emails like this one, please contact [email protected].
