AMBARI-17184. HBase doesn't start because of lacking of variable. (Masahiro Tanaka via avijayan)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/23a23a5e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/23a23a5e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/23a23a5e Branch: refs/heads/branch-2.5 Commit: 23a23a5e2d77dac00b036634cf114138f0f01bae Parents: 2845140 Author: Aravindan Vijayan <[email protected]> Authored: Mon Nov 14 21:26:56 2016 -0800 Committer: Aravindan Vijayan <[email protected]> Committed: Tue Nov 15 11:06:39 2016 -0800 ---------------------------------------------------------------------- .../HBASE/0.96.0.2.0/package/scripts/params_linux.py | 7 +++++++ .../templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2 | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/23a23a5e/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py index 1deb140..10b1e7d 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py @@ -180,6 +180,13 @@ if has_metric_collector: metrics_report_interval = default("/configurations/ams-site/timeline.metrics.sink.report.interval", 60) metrics_collection_period = default("/configurations/ams-site/timeline.metrics.sink.collection.period", 10) +#Collector hosts +metric_collector_hosts = "" +if ams_collector_hosts: + for host in ams_collector_hosts: + metric_collector_hosts += host + ':' + metric_collector_port + ',' + metric_collector_hosts = metric_collector_hosts[:-1] + # if hbase is selected the hbase_rs_hosts, should not be empty, but still default just in case if 'slave_hosts' in config['clusterHostInfo']: rs_hosts = default('/clusterHostInfo/hbase_rs_hosts', '/clusterHostInfo/slave_hosts') #if hbase_rs_hosts not given it is assumed that region servers on same nodes as slaves http://git-wip-us.apache.org/repos/asf/ambari/blob/23a23a5e/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2 b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2 index dcec3d4..8183333 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2 +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2 @@ -65,7 +65,9 @@ rpc.collector={{metric_collector_host}}:{{metric_collector_port}} hbase.sink.timeline.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink hbase.sink.timeline.period={{metrics_collection_period}} hbase.sink.timeline.sendInterval={{metrics_report_interval}}000 -hbase.sink.timeline.collector={{metric_collector_protocol}}://{{metric_collector_host}}:{{metric_collector_port}} +hbase.sink.timeline.collector={{metric_collector_hosts}} +hbase.sink.timeline.protocol={{metric_collector_protocol}} + # HTTPS properties hbase.sink.timeline.truststore.path = {{metric_truststore_path}}
