You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by bi...@apache.org on 2016/05/13 01:55:06 UTC
[5/7] incubator-slider git commit: SLIDER-1107 update configs for
hbase-nopkg
SLIDER-1107 update configs for hbase-nopkg
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/c7a7c0d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/c7a7c0d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/c7a7c0d9
Branch: refs/heads/feature/SLIDER-1107_AM_config_generation
Commit: c7a7c0d92b5c85fe95828d1e5e2904954bc733be
Parents: bafc5e7
Author: Billie Rinaldi <bi...@gmail.com>
Authored: Tue May 10 10:10:39 2016 -0700
Committer: Billie Rinaldi <bi...@gmail.com>
Committed: Thu May 12 18:51:38 2016 -0700
----------------------------------------------------------------------
app-packages/hbase-nopkg/appConfig-default.json | 9 +--
.../hbase-nopkg/appConfig-secured-default.json | 19 +++--
.../clientInstallConfig-default.json | 6 ++
app-packages/hbase-nopkg/metainfo-secured.xml | 78 ++++++++++++--------
app-packages/hbase-nopkg/metainfo.xml | 22 +++---
5 files changed, 79 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c7a7c0d9/app-packages/hbase-nopkg/appConfig-default.json
----------------------------------------------------------------------
diff --git a/app-packages/hbase-nopkg/appConfig-default.json b/app-packages/hbase-nopkg/appConfig-default.json
index fffad49..980538a 100644
--- a/app-packages/hbase-nopkg/appConfig-default.json
+++ b/app-packages/hbase-nopkg/appConfig-default.json
@@ -11,7 +11,6 @@
"site.global.app_user": "yarn",
"site.global.app_version": "${hbase.version}",
"site.global.app_root": "${AGENT_WORK_ROOT}/app/packages/hbase-${hbase.version}",
- "site.global.app_conf_dir": "${AGENT_WORK_ROOT}/app/conf",
"site.global.pid_file": "${@//site/global/app_pid_dir}/hbase-${@//site/global/app_user}-${@//site/global/hbase_component}.pid",
"site.global.daemon_cmd": "env HBASE_IDENT_STRING=${@//site/global/app_user} ${@//site/global/app_root}/bin/hbase-daemon.sh --config ${@//site/global/app_conf_dir}",
@@ -100,14 +99,10 @@
"site.global.hbase_component": "rest"
},
"HBASE_THRIFT": {
- "site.global.hbase_component": "thrift",
- "site.global.start_command": "${@//site/global/daemon_cmd} start thrift -p ${@//site/global/thrift_port}",
- "site.global.stop_command": "${@//site/global/daemon_cmd} stop thrift"
+ "site.global.hbase_component": "thrift"
},
"HBASE_THRIFT2": {
- "site.global.hbase_component": "thrift2",
- "site.global.start_command": "${@//site/global/daemon_cmd} start thrift2 -p ${@//site/global/thrift2_port}",
- "site.global.stop_command": "${@//site/global/daemon_cmd} stop thrift2"
+ "site.global.hbase_component": "thrift2"
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c7a7c0d9/app-packages/hbase-nopkg/appConfig-secured-default.json
----------------------------------------------------------------------
diff --git a/app-packages/hbase-nopkg/appConfig-secured-default.json b/app-packages/hbase-nopkg/appConfig-secured-default.json
index 7c40072..ac6e45b 100644
--- a/app-packages/hbase-nopkg/appConfig-secured-default.json
+++ b/app-packages/hbase-nopkg/appConfig-secured-default.json
@@ -10,16 +10,18 @@
"site.global.app_user": "${USER_NAME}",
"site.global.app_version": "${hbase.version}",
- "site.global.app_root": "app/packages/hbase-${hbase.version}",
- "site.global.app_conf_dir": "app/conf",
+ "site.global.app_root": "${AGENT_WORK_ROOT}/app/packages/hbase-${hbase.version}",
+
+ "site.global.pid_file": "${@//site/global/app_pid_dir}/hbase-${@//site/global/app_user}-${@//site/global/hbase_component}.pid",
+ "site.global.daemon_cmd": "env HBASE_IDENT_STRING=${@//site/global/app_user} ${@//site/global/app_root}/bin/hbase-daemon.sh --config ${@//site/global/app_conf_dir}",
"site.global.hbase_instance_name": "instancename",
"site.global.hbase_root_password": "secret",
"site.global.user_group": "hadoop",
- "site.global.monitor_protocol": "http",
- "site.global.hbase_thrift_port": "0",
- "site.global.hbase_thrift2_port": "0",
- "site.global.hbase_rest_port": "0",
+
+ "site.global.thrift_port": "0",
+ "site.global.thrift2_port": "0",
+ "site.global.rest_port": "0",
"site.hbase-env.template.file": "hbase-env-secured.sh.j2",
"site.hbase-env.java64_home": "${JAVA_HOME}",
@@ -99,19 +101,24 @@
"slider.keytab.principal.name": "${USER_NAME}"
},
"HBASE_MASTER": {
+ "site.global.hbase_component": "master",
"site.hbase-metrics2.template.file": "hadoop-metrics2-hbase.properties-MASTER.j2",
"site.hbase-jaas.template.file": "hbase_master_jaas.conf.j2"
},
"HBASE_REGIONSERVER": {
+ "site.global.hbase_component": "regionserver",
"site.hbase-jaas.template.file": "hbase_regionserver_jaas.conf.j2"
},
"HBASE_REST": {
+ "site.global.hbase_component": "rest",
"site.hbase-jaas.template.file": "hbase_regionserver_jaas.conf.j2"
},
"HBASE_THRIFT": {
+ "site.global.hbase_component": "thrift",
"site.hbase-jaas.template.file": "hbase_regionserver_jaas.conf.j2"
},
"HBASE_THRIFT2": {
+ "site.global.hbase_component": "thrift2",
"site.hbase-jaas.template.file": "hbase_regionserver_jaas.conf.j2"
},
"HBASE_CLIENT": {
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c7a7c0d9/app-packages/hbase-nopkg/clientInstallConfig-default.json
----------------------------------------------------------------------
diff --git a/app-packages/hbase-nopkg/clientInstallConfig-default.json b/app-packages/hbase-nopkg/clientInstallConfig-default.json
new file mode 100644
index 0000000..f195e7f
--- /dev/null
+++ b/app-packages/hbase-nopkg/clientInstallConfig-default.json
@@ -0,0 +1,6 @@
+{
+ "schema":"http://example.org/specification/v2.0.0",
+ "global":{
+ "client_root": "hbase-${hbase.version}"
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c7a7c0d9/app-packages/hbase-nopkg/metainfo-secured.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase-nopkg/metainfo-secured.xml b/app-packages/hbase-nopkg/metainfo-secured.xml
index 11c7d0a..bc5759e 100644
--- a/app-packages/hbase-nopkg/metainfo-secured.xml
+++ b/app-packages/hbase-nopkg/metainfo-secured.xml
@@ -43,19 +43,19 @@
</export>
<export>
<name>org.apache.slider.hbase.rest</name>
- <value>http://${HBASE_REST_HOST}:${site.global.hbase_rest_port}</value>
+ <value>http://${HBASE_REST_HOST}:${site.global.rest_port}</value>
</export>
<export>
<name>org.apache.slider.hbase.thrift2</name>
- <value>http://${HBASE_THRIFT2_HOST}:${site.global.hbase_thrift2_port}</value>
+ <value>http://${HBASE_THRIFT2_HOST}:${site.global.thrift2_port}</value>
</export>
<export>
<name>org.apache.slider.hbase.thrift</name>
- <value>http://${HBASE_THRIFT_HOST}:${site.global.hbase_thrift_port}</value>
+ <value>http://${HBASE_THRIFT_HOST}:${site.global.thrift_port}</value>
</export>
<export>
<name>org.apache.slider.metrics</name>
- <value>http://${site.global.metric_collector_host}:${site.global.metric_collector_port}/ws/v1/timeline/metrics</value>
+ <value>http://${site.hbase-metrics2.metric_collector_host}:${site.hbase-metrics2.metric_collector_port}/ws/v1/timeline/metrics</value>
</export>
<export>
<name>org.apache.slider.hbase.zk-path</name>
@@ -96,11 +96,15 @@
<value>${site.hbase-site.hbase.zookeeper.quorum}:${site.hbase-site.zookeeper.znode.parent}</value>
</componentExport>
</componentExports>
- <commandScript>
- <script>scripts/hbase_master.py</script>
- <scriptType>PYTHON</scriptType>
- <timeout>600</timeout>
- </commandScript>
+ <commands>
+ <command>
+ <exec>{$conf:@//site/global/daemon_cmd} start master</exec>
+ </command>
+ <command>
+ <exec>{$conf:@//site/global/daemon_cmd} stop master</exec>
+ <name>STOP</name>
+ </command>
+ </commands>
<configFile>
<type>template</type>
<fileName>app/conf/hbase_master_jaas.conf</fileName>
@@ -112,10 +116,15 @@
<name>HBASE_REGIONSERVER</name>
<category>SLAVE</category>
<minInstanceCount>1</minInstanceCount>
- <commandScript>
- <script>scripts/hbase_regionserver.py</script>
- <scriptType>PYTHON</scriptType>
- </commandScript>
+ <commands>
+ <command>
+ <exec>{$conf:@//site/global/daemon_cmd} start regionserver</exec>
+ </command>
+ <command>
+ <exec>{$conf:@//site/global/daemon_cmd} stop regionserver</exec>
+ <name>STOP</name>
+ </command>
+ </commands>
<configFile>
<type>template</type>
<fileName>app/conf/hbase_regionserver_jaas.conf</fileName>
@@ -127,10 +136,15 @@
<name>HBASE_REST</name>
<category>MASTER</category>
<appExports>QuickLinks-org.apache.slider.hbase.rest</appExports>
- <commandScript>
- <script>scripts/hbase_rest.py</script>
- <scriptType>PYTHON</scriptType>
- </commandScript>
+ <commands>
+ <command>
+ <exec>{$conf:@//site/global/daemon_cmd} start rest -p {$conf:@//site/global/rest_port}</exec>
+ </command>
+ <command>
+ <exec>{$conf:@//site/global/daemon_cmd} stop rest</exec>
+ <name>STOP</name>
+ </command>
+ </commands>
<configFile>
<type>template</type>
<fileName>app/conf/hbase_rest_jaas.conf</fileName>
@@ -142,10 +156,15 @@
<name>HBASE_THRIFT</name>
<category>MASTER</category>
<appExports>QuickLinks-org.apache.slider.hbase.thrift</appExports>
- <commandScript>
- <script>scripts/hbase_thrift.py</script>
- <scriptType>PYTHON</scriptType>
- </commandScript>
+ <commands>
+ <command>
+ <exec>{$conf:@//site/global/daemon_cmd} start thrift -p {$conf:@//site/global/thrift_port}</exec>
+ </command>
+ <command>
+ <exec>{$conf:@//site/global/daemon_cmd} stop thrift</exec>
+ <name>STOP</name>
+ </command>
+ </commands>
<configFile>
<type>template</type>
<fileName>app/conf/hbase_thrift2_jaas.conf</fileName>
@@ -158,10 +177,15 @@
<category>MASTER</category>
<minInstanceCount>0</minInstanceCount>
<appExports>QuickLinks-org.apache.slider.hbase.thrift2</appExports>
- <commandScript>
- <script>scripts/hbase_thrift2.py</script>
- <scriptType>PYTHON</scriptType>
- </commandScript>
+ <commands>
+ <command>
+ <exec>{$conf:@//site/global/daemon_cmd} start thrift2 -p {$conf:@//site/global/thrift_port}</exec>
+ </command>
+ <command>
+ <exec>{$conf:@//site/global/daemon_cmd} stop thrift2</exec>
+ <name>STOP</name>
+ </command>
+ </commands>
<configFile>
<type>template</type>
<fileName>app/conf/hbase_thrift_jaas.conf</fileName>
@@ -172,10 +196,6 @@
<component>
<name>HBASE_CLIENT</name>
<category>CLIENT</category>
- <commandScript>
- <script>scripts/hbase_client.py</script>
- <scriptType>PYTHON</scriptType>
- </commandScript>
<configFile>
<type>template</type>
<fileName>app/conf/hbase_client_jaas.conf</fileName>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c7a7c0d9/app-packages/hbase-nopkg/metainfo.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase-nopkg/metainfo.xml b/app-packages/hbase-nopkg/metainfo.xml
index 9abc9dc..60ef10b 100644
--- a/app-packages/hbase-nopkg/metainfo.xml
+++ b/app-packages/hbase-nopkg/metainfo.xml
@@ -43,19 +43,19 @@
</export>
<export>
<name>org.apache.slider.hbase.rest</name>
- <value>http://${HBASE_REST_HOST}:${site.global.hbase_rest_port}</value>
+ <value>http://${HBASE_REST_HOST}:${site.global.rest_port}</value>
</export>
<export>
<name>org.apache.slider.hbase.thrift2</name>
- <value>http://${HBASE_THRIFT2_HOST}:${site.global.hbase_thrift2_port}</value>
+ <value>http://${HBASE_THRIFT2_HOST}:${site.global.thrift2_port}</value>
</export>
<export>
<name>org.apache.slider.hbase.thrift</name>
- <value>http://${HBASE_THRIFT_HOST}:${site.global.hbase_thrift_port}</value>
+ <value>http://${HBASE_THRIFT_HOST}:${site.global.thrift_port}</value>
</export>
<export>
<name>org.apache.slider.metrics</name>
- <value>http://${site.global.metric_collector_host}:${site.global.metric_collector_port}/ws/v1/timeline/metrics</value>
+ <value>http://${site.hbase-metrics2.metric_collector_host}:${site.hbase-metrics2.metric_collector_port}/ws/v1/timeline/metrics</value>
</export>
<export>
<name>org.apache.slider.hbase.zk-path</name>
@@ -171,10 +171,6 @@
<component>
<name>HBASE_CLIENT</name>
<category>CLIENT</category>
- <commandScript>
- <script>scripts/hbase_client.py</script>
- <scriptType>PYTHON</scriptType>
- </commandScript>
</component>
</components>
@@ -200,27 +196,27 @@
<configFiles>
<configFile>
<type>xml</type>
- <fileName>app/conf/hbase-site.xml</fileName>
+ <fileName>hbase-site.xml</fileName>
<dictionaryName>hbase-site</dictionaryName>
</configFile>
<configFile>
<type>template</type>
- <fileName>app/conf/hbase-env.sh</fileName>
+ <fileName>hbase-env.sh</fileName>
<dictionaryName>hbase-env</dictionaryName>
</configFile>
<configFile>
<type>template</type>
- <fileName>app/conf/log4j.properties</fileName>
+ <fileName>log4j.properties</fileName>
<dictionaryName>hbase-log4j</dictionaryName>
</configFile>
<configFile>
<type>xml</type>
- <fileName>app/conf/hbase-policy.xml</fileName>
+ <fileName>hbase-policy.xml</fileName>
<dictionaryName>hbase-policy</dictionaryName>
</configFile>
<configFile>
<type>template</type>
- <fileName>app/conf/hadoop-metrics2-hbase.properties</fileName>
+ <fileName>hadoop-metrics2-hbase.properties</fileName>
<dictionaryName>hbase-metrics2</dictionaryName>
</configFile>
</configFiles>