ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From swa...@apache.org
Subject ambari git commit: AMBARI-17184. HBase doesn't start because of lacking of variable. (Masahiro Tanaka via swagle)
Date Tue, 05 Jul 2016 19:43:49 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk bd99d76d3 -> 25ed05ce8


AMBARI-17184. HBase doesn't start because of lacking of variable. (Masahiro Tanaka via swagle)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/25ed05ce
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/25ed05ce
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/25ed05ce

Branch: refs/heads/trunk
Commit: 25ed05ce88d47c2ff184238be42abd5869514ced
Parents: bd99d76
Author: Siddharth Wagle <swagle@hortonworks.com>
Authored: Tue Jul 5 12:43:40 2016 -0700
Committer: Siddharth Wagle <swagle@hortonworks.com>
Committed: Tue Jul 5 12:43:40 2016 -0700

----------------------------------------------------------------------
 .../HBASE/0.96.0.2.0/package/scripts/params_linux.py        | 9 ++++++++-
 .../hadoop-metrics2-hbase.properties-GANGLIA-RS.j2          | 4 +++-
 2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/25ed05ce/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 6d304d4..0602d11 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
@@ -173,6 +173,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
@@ -394,4 +401,4 @@ if has_ranger_admin:
 
 
 create_hbase_home_directory = check_stack_feature(StackFeature.HBASE_HOME_DIRECTORY, stack_version_formatted)
-hbase_home_directory = format("/user/{hbase_user}")
\ No newline at end of file
+hbase_home_directory = format("/user/{hbase_user}")

http://git-wip-us.apache.org/repos/asf/ambari/blob/25ed05ce/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}}


Mime
View raw message