You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2014/12/20 01:40:35 UTC

ambari git commit: AMBARI-8845. Configure number of regions created for SYSTEM.SEQUENCE. (swagle)

Repository: ambari
Updated Branches:
  refs/heads/trunk 50819a309 -> ecce96ad6


AMBARI-8845. Configure number of regions created for SYSTEM.SEQUENCE. (swagle)


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

Branch: refs/heads/trunk
Commit: ecce96ad62a60f4ea79dabeb4749be02fae3ab65
Parents: 50819a3
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Fri Dec 19 16:40:24 2014 -0800
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Fri Dec 19 16:40:30 2014 -0800

----------------------------------------------------------------------
 .../metrics/timeline/TimelineMetricConfiguration.java        | 6 +++---
 .../AMS/0.1.0/configuration/ams-hbase-site.xml               | 8 +++++++-
 .../package/templates/hadoop-metrics2-hbase.properties.j2    | 1 +
 .../hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2       | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/ecce96ad/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TimelineMetricConfiguration.java
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TimelineMetricConfiguration.java b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TimelineMetricConfiguration.java
index e1275c8..248894c 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TimelineMetricConfiguration.java
+++ b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TimelineMetricConfiguration.java
@@ -182,10 +182,10 @@ public class TimelineMetricConfiguration {
   }
 
   public String getTimelineServiceRpcAddress() {
-    String defaultHttpAddress = "0.0.0.0:60200";
+    String defaultRpcAddress = "0.0.0.0:60200";
     if (metricsConf != null) {
-      return metricsConf.get(TIMELINE_SERVICE_RPC_ADDRESS, defaultHttpAddress);
+      return metricsConf.get(TIMELINE_SERVICE_RPC_ADDRESS, defaultRpcAddress);
     }
-    return defaultHttpAddress;
+    return defaultRpcAddress;
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/ecce96ad/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-site.xml b/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-site.xml
index 9d35ba2..a8e2cb0 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-site.xml
+++ b/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-site.xml
@@ -264,5 +264,11 @@
     <value>120000</value>
     <description>ZooKeeper session timeout in milliseconds.</description>
   </property>
-
+  <property>
+    <name>phoenix.sequence.saltBuckets</name>
+    <value>2</value>
+    <description>
+      Controls the number of pre-allocated regions for SYSTEM.SEQUENCE table.
+    </description>
+  </property>
 </configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/ecce96ad/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2 b/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2
index e74dbe3..13b0948 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2
+++ b/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2
@@ -50,6 +50,7 @@ rpc.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
 rpc.period=10
 rpc.collector={{ams_collector_host_single}}:{{metric_collector_port}}
 
+*.timeline.plugin.urls=file:///usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar
 hbase.sink.timeline.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
 hbase.sink.timeline.period=10
 hbase.sink.timeline.collector={{ams_collector_host_single}}:{{metric_collector_port}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/ecce96ad/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2 b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2
index 34a7d63..f8a82d9 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2
@@ -49,7 +49,7 @@ hbase.extendedperiod = 3600
 
 {% if has_metric_collector %}
 
-*.timline.plugin.urls=file:///usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar
+*.timeline.plugin.urls=file:///usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar
 hbase.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
 hbase.period=10
 hbase.collector={{metric_collector_host}}:{{metric_collector_port}}