You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/08/20 11:26:34 UTC
[36/50] [abbrv] git commit: SLIDER-324. Exports should be attributed
to individual master components rather than only one master component (app
changes)
SLIDER-324. Exports should be attributed to individual master components rather than only one master component (app changes)
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/14b54a75
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/14b54a75
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/14b54a75
Branch: refs/heads/master
Commit: 14b54a75bed9f6e74e27b54c096cd1469b023b7c
Parents: 2a25ab9
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Sun Aug 17 14:15:16 2014 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Sun Aug 17 14:15:16 2014 -0700
----------------------------------------------------------------------
app-packages/accumulo/metainfo.xml | 3 ++-
app-packages/hbase/appConfig.json | 1 +
app-packages/hbase/metainfo.xml | 30 ++++++++++++++++++++++--------
app-packages/hbase/pom.xml | 2 +-
4 files changed, 26 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/14b54a75/app-packages/accumulo/metainfo.xml
----------------------------------------------------------------------
diff --git a/app-packages/accumulo/metainfo.xml b/app-packages/accumulo/metainfo.xml
index 4cf6c79..b1aa9de 100644
--- a/app-packages/accumulo/metainfo.xml
+++ b/app-packages/accumulo/metainfo.xml
@@ -40,7 +40,7 @@
</value>
</export>
<export>
- <name>org.apache.slider.jmx</name>
+ <name>app.jmx</name>
<value>
${site.global.monitor_protocol}://${ACCUMULO_MONITOR_HOST}:${site.accumulo-site.monitor.port.client}/xml
</value>
@@ -85,6 +85,7 @@
<name>ACCUMULO_MONITOR</name>
<category>MASTER</category>
<publishConfig>true</publishConfig>
+ <appExports>QuickLinks-app.jmx,QuickLinks-org.apache.slider.monitor</appExports>
<commandScript>
<script>scripts/accumulo_monitor.py</script>
<scriptType>PYTHON</scriptType>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/14b54a75/app-packages/hbase/appConfig.json
----------------------------------------------------------------------
diff --git a/app-packages/hbase/appConfig.json b/app-packages/hbase/appConfig.json
index 24d9a84..d00ae6d 100644
--- a/app-packages/hbase/appConfig.json
+++ b/app-packages/hbase/appConfig.json
@@ -25,6 +25,7 @@
"site.global.ganglia_server_id": "Application1",
"site.global.hbase_thrift_port": "${HBASE_THRIFT.ALLOCATED_PORT}",
"site.global.hbase_thrift2_port": "${HBASE_THRIFT2.ALLOCATED_PORT}",
+ "site.global.hbase_rest_port": "${HBASE_REST.ALLOCATED_PORT}",
"site.hbase-site.hbase.hstore.flush.retries.number": "120",
"site.hbase-site.hbase.client.keyvalue.maxsize": "10485760",
"site.hbase-site.hbase.hstore.compactionThreshold": "3",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/14b54a75/app-packages/hbase/metainfo.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase/metainfo.xml b/app-packages/hbase/metainfo.xml
index a5dab0c..aae048d 100644
--- a/app-packages/hbase/metainfo.xml
+++ b/app-packages/hbase/metainfo.xml
@@ -53,11 +53,11 @@
<value>http://${HBASE_THRIFT_HOST}:${site.global.hbase_thrift_port}</value>
</export>
<export>
- <name>org.apache.slider.metrics</name>
+ <name>app.metrics</name>
<value>http://${site.global.ganglia_server_host}/cgi-bin/rrd.py?c=${site.global.ganglia_server_id}</value>
</export>
<export>
- <name>org.apache.slider.ganglia</name>
+ <name>app.ganglia</name>
<value>http://${site.global.ganglia_server_host}/ganglia?c=${site.global.ganglia_server_id}</value>
</export>
</exports>
@@ -81,6 +81,17 @@
<category>MASTER</category>
<minInstanceCount>1</minInstanceCount>
<maxInstanceCount>2</maxInstanceCount>
+ <appExports>QuickLinks-org.apache.slider.jmx,QuickLinks-org.apache.slider.monitor,QuickLinks-app.metrics,QuickLinks-app.ganglia</appExports>
+ <componentExports>
+ <componentExport>
+ <name>app.jmx</name>
+ <value>${THIS_HOST}:${site.hbase-site.hbase.master.info.port}/jmx</value>
+ </componentExport>
+ <componentExport>
+ <name>app.monitor</name>
+ <value>${THIS_HOST}:${site.hbase-site.hbase.master.info.port}/master-status</value>
+ </componentExport>
+ </componentExports>
<commandScript>
<script>scripts/hbase_master.py</script>
<scriptType>PYTHON</scriptType>
@@ -100,8 +111,9 @@
<component>
<name>HBASE_REST</name>
- <category>SLAVE</category>
- <minInstanceCount>1</minInstanceCount>
+ <category>MASTER</category>
+ <minInstanceCount>0</minInstanceCount>
+ <appExports>QuickLinks-org.apache.slider.hbase.rest</appExports>
<commandScript>
<script>scripts/hbase_rest.py</script>
<scriptType>PYTHON</scriptType>
@@ -110,8 +122,9 @@
<component>
<name>HBASE_THRIFT</name>
- <category>SLAVE</category>
- <minInstanceCount>1</minInstanceCount>
+ <category>MASTER</category>
+ <minInstanceCount>0</minInstanceCount>
+ <appExports>QuickLinks-org.apache.slider.hbase.thrift</appExports>
<commandScript>
<script>scripts/hbase_thrift.py</script>
<scriptType>PYTHON</scriptType>
@@ -120,8 +133,9 @@
<component>
<name>HBASE_THRIFT2</name>
- <category>SLAVE</category>
- <minInstanceCount>1</minInstanceCount>
+ <category>MASTER</category>
+ <minInstanceCount>0</minInstanceCount>
+ <appExports>QuickLinks-org.apache.slider.hbase.thrift2</appExports>
<commandScript>
<script>scripts/hbase_thrift2.py</script>
<scriptType>PYTHON</scriptType>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/14b54a75/app-packages/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase/pom.xml b/app-packages/hbase/pom.xml
index 4450f8b..7dede6c 100644
--- a/app-packages/hbase/pom.xml
+++ b/app-packages/hbase/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.31.0-incubating-SNAPSHOT</version>
+ <version>0.41.0-incubating-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>