You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ma...@apache.org on 2014/01/17 20:49:27 UTC
[12/12] git commit: AMBARI-4336. Move 1.3.4 stack to 1.3.3 using the
python libraries. (mahadev)
AMBARI-4336. Move 1.3.4 stack to 1.3.3 using the python libraries. (mahadev)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/92583535
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/92583535
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/92583535
Branch: refs/heads/trunk
Commit: 92583535dc8ad24c49f9d7f4c6c9c8b56575c497
Parents: 186d6a7
Author: Mahadev Konar <ma...@apache.org>
Authored: Fri Jan 17 11:31:56 2014 -0800
Committer: Mahadev Konar <ma...@apache.org>
Committed: Fri Jan 17 11:31:56 2014 -0800
----------------------------------------------------------------------
.../HDP/1.3.3/services/FLUME/metainfo.xml | 1 +
.../HDP/1.3.3/services/GANGLIA/metainfo.xml | 102 +-
.../HDP/1.3.3/services/HBASE/metainfo.xml | 113 +-
.../services/HCATALOG/configuration/global.xml | 45 -
.../HDP/1.3.3/services/HCATALOG/metainfo.xml | 30 -
.../services/HDFS/configuration/hdfs-site.xml | 372 ++---
.../stacks/HDP/1.3.3/services/HDFS/metainfo.xml | 134 +-
.../services/HIVE/configuration/global.xml | 23 +
.../services/HIVE/configuration/hive-site.xml | 8 +-
.../stacks/HDP/1.3.3/services/HIVE/metainfo.xml | 175 ++-
.../stacks/HDP/1.3.3/services/HUE/metainfo.xml | 1 +
.../MAPREDUCE/configuration/mapred-site.xml | 552 ++++---
.../HDP/1.3.3/services/MAPREDUCE/metainfo.xml | 92 +-
.../HDP/1.3.3/services/NAGIOS/metainfo.xml | 94 +-
.../HDP/1.3.3/services/OOZIE/metainfo.xml | 103 +-
.../stacks/HDP/1.3.3/services/PIG/metainfo.xml | 47 +-
.../HDP/1.3.3/services/SQOOP/metainfo.xml | 63 +-
.../HDP/1.3.3/services/WEBHCAT/metainfo.xml | 91 +-
.../HDP/1.3.3/services/ZOOKEEPER/metainfo.xml | 57 +-
.../before-INSTALL/files/changeToSecureUid.sh | 50 -
.../1.3.4/hooks/before-INSTALL/scripts/hook.py | 36 -
.../hooks/before-INSTALL/scripts/params.py | 81 --
.../scripts/shared_initialization.py | 107 --
.../hooks/before-START/files/checkForFormat.sh | 62 -
.../before-START/files/task-log4j.properties | 132 --
.../1.3.4/hooks/before-START/scripts/hook.py | 37 -
.../1.3.4/hooks/before-START/scripts/params.py | 172 ---
.../scripts/shared_initialization.py | 322 -----
.../templates/commons-logging.properties.j2 | 25 -
.../templates/exclude_hosts_list.j2 | 3 -
.../before-START/templates/hadoop-env.sh.j2 | 121 --
.../templates/hadoop-metrics2.properties.j2 | 45 -
.../hooks/before-START/templates/hdfs.conf.j2 | 17 -
.../before-START/templates/health_check-v2.j2 | 91 --
.../before-START/templates/health_check.j2 | 118 --
.../templates/include_hosts_list.j2 | 3 -
.../before-START/templates/log4j.properties.j2 | 200 ---
.../hooks/before-START/templates/slaves.j2 | 3 -
.../hooks/before-START/templates/snmpd.conf.j2 | 48 -
.../templates/taskcontroller.cfg.j2 | 20 -
.../resources/stacks/HDP/1.3.4/metainfo.xml | 22 -
.../stacks/HDP/1.3.4/repos/repoinfo.xml | 75 -
.../services/FLUME/configuration/global.xml | 24 -
.../HDP/1.3.4/services/FLUME/metainfo.xml | 31 -
.../services/GANGLIA/configuration/global.xml | 55 -
.../HDP/1.3.4/services/GANGLIA/metainfo.xml | 106 --
.../GANGLIA/package/files/checkGmetad.sh | 37 -
.../GANGLIA/package/files/checkGmond.sh | 62 -
.../GANGLIA/package/files/checkRrdcached.sh | 34 -
.../services/GANGLIA/package/files/gmetad.init | 73 -
.../services/GANGLIA/package/files/gmetadLib.sh | 204 ---
.../services/GANGLIA/package/files/gmond.init | 73 -
.../services/GANGLIA/package/files/gmondLib.sh | 545 -------
.../1.3.4/services/GANGLIA/package/files/rrd.py | 213 ---
.../GANGLIA/package/files/rrdcachedLib.sh | 47 -
.../GANGLIA/package/files/setupGanglia.sh | 141 --
.../GANGLIA/package/files/startGmetad.sh | 64 -
.../GANGLIA/package/files/startGmond.sh | 80 --
.../GANGLIA/package/files/startRrdcached.sh | 69 -
.../GANGLIA/package/files/stopGmetad.sh | 43 -
.../services/GANGLIA/package/files/stopGmond.sh | 54 -
.../GANGLIA/package/files/stopRrdcached.sh | 41 -
.../GANGLIA/package/files/teardownGanglia.sh | 28 -
.../services/GANGLIA/package/scripts/ganglia.py | 106 --
.../GANGLIA/package/scripts/ganglia_monitor.py | 163 ---
.../package/scripts/ganglia_monitor_service.py | 31 -
.../GANGLIA/package/scripts/ganglia_server.py | 181 ---
.../package/scripts/ganglia_server_service.py | 27 -
.../services/GANGLIA/package/scripts/params.py | 74 -
.../GANGLIA/package/scripts/status_params.py | 25 -
.../package/templates/gangliaClusters.conf.j2 | 34 -
.../GANGLIA/package/templates/gangliaEnv.sh.j2 | 24 -
.../GANGLIA/package/templates/gangliaLib.sh.j2 | 62 -
.../services/HBASE/configuration/global.xml | 160 ---
.../HBASE/configuration/hbase-policy.xml | 53 -
.../services/HBASE/configuration/hbase-site.xml | 367 -----
.../HDP/1.3.4/services/HBASE/metainfo.xml | 123 --
.../HBASE/package/files/hbaseSmokeVerify.sh | 32 -
.../services/HBASE/package/scripts/__init__.py | 19 -
.../services/HBASE/package/scripts/functions.py | 67 -
.../services/HBASE/package/scripts/hbase.py | 91 --
.../HBASE/package/scripts/hbase_client.py | 52 -
.../HBASE/package/scripts/hbase_master.py | 74 -
.../HBASE/package/scripts/hbase_regionserver.py | 75 -
.../HBASE/package/scripts/hbase_service.py | 46 -
.../services/HBASE/package/scripts/params.py | 84 --
.../HBASE/package/scripts/service_check.py | 89 --
.../HBASE/package/scripts/status_params.py | 25 -
.../hadoop-metrics.properties-GANGLIA-MASTER.j2 | 50 -
.../hadoop-metrics.properties-GANGLIA-RS.j2 | 50 -
.../templates/hadoop-metrics.properties.j2 | 50 -
.../HBASE/package/templates/hbase-env.sh.j2 | 82 --
.../HBASE/package/templates/hbase-smoke.sh.j2 | 26 -
.../package/templates/hbase_client_jaas.conf.j2 | 23 -
.../templates/hbase_grant_permissions.j2 | 21 -
.../package/templates/hbase_master_jaas.conf.j2 | 25 -
.../templates/hbase_regionserver_jaas.conf.j2 | 25 -
.../HBASE/package/templates/regionservers.j2 | 2 -
.../services/HDFS/configuration/core-site.xml | 253 ----
.../services/HDFS/configuration/global.xml | 187 ---
.../HDFS/configuration/hadoop-policy.xml | 134 --
.../services/HDFS/configuration/hdfs-site.xml | 476 ------
.../stacks/HDP/1.3.4/services/HDFS/metainfo.xml | 146 --
.../HDFS/package/files/checkForFormat.sh | 62 -
.../services/HDFS/package/files/checkWebUI.py | 53 -
.../services/HDFS/package/scripts/datanode.py | 57 -
.../HDFS/package/scripts/hdfs_client.py | 52 -
.../HDFS/package/scripts/hdfs_datanode.py | 59 -
.../HDFS/package/scripts/hdfs_namenode.py | 192 ---
.../HDFS/package/scripts/hdfs_snamenode.py | 53 -
.../services/HDFS/package/scripts/namenode.py | 66 -
.../services/HDFS/package/scripts/params.py | 165 ---
.../HDFS/package/scripts/service_check.py | 106 --
.../services/HDFS/package/scripts/snamenode.py | 64 -
.../HDFS/package/scripts/status_params.py | 31 -
.../services/HDFS/package/scripts/utils.py | 133 --
.../package/templates/exclude_hosts_list.j2 | 3 -
.../services/HIVE/configuration/global.xml | 148 --
.../services/HIVE/configuration/hive-site.xml | 236 ---
.../stacks/HDP/1.3.4/services/HIVE/metainfo.xml | 186 ---
.../services/HIVE/package/files/addMysqlUser.sh | 41 -
.../services/HIVE/package/files/hcatSmoke.sh | 35 -
.../services/HIVE/package/files/hiveSmoke.sh | 23 -
.../services/HIVE/package/files/hiveserver2.sql | 23 -
.../HIVE/package/files/hiveserver2Smoke.sh | 31 -
.../services/HIVE/package/files/pigSmoke.sh | 18 -
.../HIVE/package/files/startHiveserver2.sh | 22 -
.../HIVE/package/files/startMetastore.sh | 22 -
.../services/HIVE/package/scripts/__init__.py | 19 -
.../1.3.4/services/HIVE/package/scripts/hcat.py | 47 -
.../HIVE/package/scripts/hcat_client.py | 41 -
.../HIVE/package/scripts/hcat_service_check.py | 63 -
.../1.3.4/services/HIVE/package/scripts/hive.py | 122 --
.../HIVE/package/scripts/hive_client.py | 41 -
.../HIVE/package/scripts/hive_metastore.py | 63 -
.../HIVE/package/scripts/hive_server.py | 63 -
.../HIVE/package/scripts/hive_service.py | 56 -
.../HIVE/package/scripts/mysql_server.py | 77 -
.../HIVE/package/scripts/mysql_service.py | 38 -
.../services/HIVE/package/scripts/params.py | 123 --
.../HIVE/package/scripts/service_check.py | 56 -
.../HIVE/package/scripts/status_params.py | 30 -
.../HIVE/package/templates/hcat-env.sh.j2 | 25 -
.../HIVE/package/templates/hive-env.sh.j2 | 55 -
.../1.3.4/services/HUE/configuration/global.xml | 35 -
.../services/HUE/configuration/hue-site.xml | 290 ----
.../stacks/HDP/1.3.4/services/HUE/metainfo.xml | 32 -
.../configuration/capacity-scheduler.xml | 195 ---
.../MAPREDUCE/configuration/core-site.xml | 20 -
.../services/MAPREDUCE/configuration/global.xml | 160 ---
.../configuration/mapred-queue-acls.xml | 39 -
.../MAPREDUCE/configuration/mapred-site.xml | 601 --------
.../HDP/1.3.4/services/MAPREDUCE/metainfo.xml | 102 --
.../MAPREDUCE/package/scripts/client.py | 43 -
.../MAPREDUCE/package/scripts/historyserver.py | 59 -
.../MAPREDUCE/package/scripts/jobtracker.py | 104 --
.../MAPREDUCE/package/scripts/mapreduce.py | 50 -
.../MAPREDUCE/package/scripts/params.py | 54 -
.../MAPREDUCE/package/scripts/service.py | 56 -
.../MAPREDUCE/package/scripts/service_check.py | 89 --
.../MAPREDUCE/package/scripts/status_params.py | 33 -
.../MAPREDUCE/package/scripts/tasktracker.py | 104 --
.../package/templates/exclude_hosts_list.j2 | 3 -
.../services/NAGIOS/configuration/global.xml | 50 -
.../HDP/1.3.4/services/NAGIOS/metainfo.xml | 106 --
.../NAGIOS/package/files/check_aggregate.php | 243 ----
.../services/NAGIOS/package/files/check_cpu.pl | 114 --
.../package/files/check_datanode_storage.php | 100 --
.../NAGIOS/package/files/check_hdfs_blocks.php | 115 --
.../package/files/check_hdfs_capacity.php | 109 --
.../files/check_hive_metastore_status.sh | 45 -
.../NAGIOS/package/files/check_hue_status.sh | 31 -
.../files/check_mapred_local_dir_used.sh | 34 -
.../package/files/check_name_dir_status.php | 93 --
.../NAGIOS/package/files/check_namenodes_ha.sh | 82 --
.../package/files/check_nodemanager_health.sh | 44 -
.../NAGIOS/package/files/check_oozie_status.sh | 45 -
.../NAGIOS/package/files/check_rpcq_latency.php | 104 --
.../package/files/check_templeton_status.sh | 45 -
.../NAGIOS/package/files/check_webui.sh | 87 --
.../NAGIOS/package/files/hdp_nagios_init.php | 81 --
.../NAGIOS/package/scripts/functions.py | 31 -
.../services/NAGIOS/package/scripts/nagios.py | 97 --
.../NAGIOS/package/scripts/nagios_server.py | 87 --
.../package/scripts/nagios_server_config.py | 91 --
.../NAGIOS/package/scripts/nagios_service.py | 36 -
.../services/NAGIOS/package/scripts/params.py | 168 ---
.../NAGIOS/package/scripts/status_params.py | 26 -
.../NAGIOS/package/templates/contacts.cfg.j2 | 91 --
.../package/templates/hadoop-commands.cfg.j2 | 114 --
.../package/templates/hadoop-hostgroups.cfg.j2 | 33 -
.../package/templates/hadoop-hosts.cfg.j2 | 34 -
.../templates/hadoop-servicegroups.cfg.j2 | 98 --
.../package/templates/hadoop-services.cfg.j2 | 714 ---------
.../NAGIOS/package/templates/nagios.cfg.j2 | 1349 ------------------
.../NAGIOS/package/templates/nagios.conf.j2 | 62 -
.../services/NAGIOS/package/templates/nagios.j2 | 146 --
.../NAGIOS/package/templates/resource.cfg.j2 | 51 -
.../services/OOZIE/configuration/global.xml | 105 --
.../services/OOZIE/configuration/oozie-site.xml | 237 ---
.../HDP/1.3.4/services/OOZIE/metainfo.xml | 113 --
.../services/OOZIE/package/files/oozieSmoke.sh | 93 --
.../OOZIE/package/files/wrap_ooziedb.sh | 31 -
.../services/OOZIE/package/scripts/oozie.py | 99 --
.../OOZIE/package/scripts/oozie_client.py | 53 -
.../OOZIE/package/scripts/oozie_server.py | 65 -
.../OOZIE/package/scripts/oozie_service.py | 45 -
.../services/OOZIE/package/scripts/params.py | 64 -
.../OOZIE/package/scripts/service_check.py | 47 -
.../OOZIE/package/scripts/status_params.py | 26 -
.../OOZIE/package/templates/oozie-env.sh.j2 | 64 -
.../package/templates/oozie-log4j.properties.j2 | 74 -
.../services/PIG/configuration/pig.properties | 52 -
.../stacks/HDP/1.3.4/services/PIG/metainfo.xml | 61 -
.../services/PIG/package/files/pigSmoke.sh | 18 -
.../services/PIG/package/scripts/params.py | 36 -
.../1.3.4/services/PIG/package/scripts/pig.py | 46 -
.../services/PIG/package/scripts/pig_client.py | 52 -
.../PIG/package/scripts/service_check.py | 75 -
.../PIG/package/templates/log4j.properties.j2 | 30 -
.../PIG/package/templates/pig-env.sh.j2 | 17 -
.../PIG/package/templates/pig.properties.j2 | 55 -
.../HDP/1.3.4/services/SQOOP/metainfo.xml | 77 -
.../services/SQOOP/package/scripts/__init__.py | 18 -
.../services/SQOOP/package/scripts/params.py | 36 -
.../SQOOP/package/scripts/service_check.py | 36 -
.../services/SQOOP/package/scripts/sqoop.py | 51 -
.../SQOOP/package/scripts/sqoop_client.py | 40 -
.../SQOOP/package/templates/sqoop-env.sh.j2 | 36 -
.../WEBHCAT/configuration/webhcat-site.xml | 126 --
.../HDP/1.3.4/services/WEBHCAT/metainfo.xml | 97 --
.../WEBHCAT/package/files/templetonSmoke.sh | 95 --
.../WEBHCAT/package/scripts/__init__.py | 21 -
.../services/WEBHCAT/package/scripts/params.py | 51 -
.../WEBHCAT/package/scripts/service_check.py | 45 -
.../WEBHCAT/package/scripts/status_params.py | 26 -
.../services/WEBHCAT/package/scripts/webhcat.py | 120 --
.../WEBHCAT/package/scripts/webhcat_server.py | 54 -
.../WEBHCAT/package/scripts/webhcat_service.py | 41 -
.../WEBHCAT/package/templates/webhcat-env.sh.j2 | 44 -
.../services/ZOOKEEPER/configuration/global.xml | 75 -
.../HDP/1.3.4/services/ZOOKEEPER/metainfo.xml | 72 -
.../services/ZOOKEEPER/package/files/zkEnv.sh | 96 --
.../ZOOKEEPER/package/files/zkServer.sh | 120 --
.../ZOOKEEPER/package/files/zkService.sh | 26 -
.../services/ZOOKEEPER/package/files/zkSmoke.sh | 78 -
.../ZOOKEEPER/package/scripts/__init__.py | 21 -
.../ZOOKEEPER/package/scripts/params.py | 71 -
.../ZOOKEEPER/package/scripts/service_check.py | 47 -
.../ZOOKEEPER/package/scripts/status_params.py | 26 -
.../ZOOKEEPER/package/scripts/zookeeper.py | 92 --
.../package/scripts/zookeeper_client.py | 43 -
.../package/scripts/zookeeper_server.py | 55 -
.../package/scripts/zookeeper_service.py | 43 -
.../package/templates/configuration.xsl.j2 | 37 -
.../package/templates/log4j.properties.j2 | 71 -
.../ZOOKEEPER/package/templates/zoo.cfg.j2 | 51 -
.../package/templates/zookeeper-env.sh.j2 | 25 -
.../templates/zookeeper_client_jaas.conf.j2 | 22 -
.../package/templates/zookeeper_jaas.conf.j2 | 25 -
260 files changed, 1403 insertions(+), 21441 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/92583535/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/FLUME/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/FLUME/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/FLUME/metainfo.xml
index 13eba83..bebb54e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/FLUME/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/FLUME/metainfo.xml
@@ -24,6 +24,7 @@
<component>
<name>FLUME_SERVER</name>
<category>MASTER</category>
+ <cardinality>1</cardinality>
</component>
</components>
http://git-wip-us.apache.org/repos/asf/ambari/blob/92583535/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/GANGLIA/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/GANGLIA/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/GANGLIA/metainfo.xml
index 1a895b8..09d78a6 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/GANGLIA/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/GANGLIA/metainfo.xml
@@ -16,29 +16,91 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Ganglia Metrics Collection system</comment>
- <version>3.5.0</version>
-
- <components>
- <component>
- <name>GANGLIA_SERVER</name>
- <category>MASTER</category>
- </component>
-
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>GANGLIA</name>
+ <comment>Ganglia Metrics Collection system</comment>
+ <version>3.5.0</version>
+ <components>
<component>
- <name>GANGLIA_MONITOR</name>
- <category>SLAVE</category>
+ <name>GANGLIA_SERVER</name>
+ <category>MASTER</category>
+ <cardinality>1</cardinality>
+ <commandScript>
+ <script>scripts/ganglia_server.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
<component>
- <name>MONITOR_WEBSERVER</name>
- <category>MASTER</category>
+ <name>GANGLIA_MONITOR</name>
+ <category>SLAVE</category>
+ <cardinality>ALL</cardinality>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ <commandScript>
+ <script>scripts/ganglia_monitor.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
- </components>
-
- <configuration-dependencies>
- <config-type>global</config-type>
- </configuration-dependencies>
-
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osType>any</osType>
+ <packages>
+ <package>
+ <type>rpm</type>
+ <name>libganglia-3.5.0-99</name>
+ </package>
+ <package>
+ <type>rpm</type>
+ <name>ganglia-devel-3.5.0-99</name>
+ </package>
+ <package>
+ <type>rpm</type>
+ <name>ganglia-gmetad-3.5.0-99</name>
+ </package>
+ <package>
+ <type>rpm</type>
+ <name>ganglia-web-3.5.7-99.noarch</name>
+ </package>
+ <package>
+ <type>rpm</type>
+ <name>python-rrdtool.x86_64</name>
+ </package>
+ <package>
+ <type>rpm</type>
+ <name>ganglia-gmond-3.5.0-99</name>
+ </package>
+ <package>
+ <type>rpm</type>
+ <name>ganglia-gmond-modules-python-3.5.0-99</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osType>suse</osType>
+ <package>
+ <type>rpm</type>
+ <name>apache2</name>
+ </package>
+ <package>
+ <type>rpm</type>
+ <name>apache2-mod_php5</name>
+ </package>
+ </osSpecific>
+ <osSpecific>
+ <osType>centos6</osType>
+ <package>
+ <type>rpm</type>
+ <name>httpd</name>
+ </package>
+ </osSpecific>
+ </osSpecifics>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/92583535/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HBASE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HBASE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HBASE/metainfo.xml
index 6643782..4c610db 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HBASE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HBASE/metainfo.xml
@@ -16,29 +16,108 @@
limitations under the License.
-->
<metainfo>
- <user>mapred</user>
- <comment>Non-relational distributed database and centralized service for configuration management & synchronization</comment>
- <version>0.94.6.1.3.3.0</version>
-
- <components>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>HBASE</name>
+ <comment>Non-relational distributed database and centralized service for configuration management &
+ synchronization
+ </comment>
+ <version>0.94.6.1.3.3.0</version>
+ <components>
<component>
- <name>HBASE_MASTER</name>
- <category>MASTER</category>
+ <name>HBASE_MASTER</name>
+ <category>MASTER</category>
+ <cardinality>1</cardinality>
+ <dependencies>
+ <dependency>
+ <name>HDFS/HDFS_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ <dependency>
+ <name>ZOOKEEPER/ZOOKEEPER_SERVER</name>
+ <scope>cluster</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ <co-locate>HBASE/HBASE_MASTER</co-locate>
+ </auto-deploy>
+ </dependency>
+ </dependencies>
+ <commandScript>
+ <script>scripts/hbase_master.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
+ <customCommands>
+ <customCommand>
+ <name>DECOMMISSION</name>
+ <commandScript>
+ <script>scripts/hbase_master.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
+ </customCommand>
+ </customCommands>
</component>
<component>
- <name>HBASE_REGIONSERVER</name>
- <category>SLAVE</category>
+ <name>HBASE_REGIONSERVER</name>
+ <category>SLAVE</category>
+ <cardinality>1+</cardinality>
+ <commandScript>
+ <script>scripts/hbase_regionserver.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
+ <customCommands>
+ <customCommand>
+ <name>DECOMMISSION</name>
+ <commandScript>
+ <script>scripts/hbase_regionserver.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
+ </customCommand>
+ </customCommands>
</component>
<component>
- <name>HBASE_CLIENT</name>
- <category>CLIENT</category>
+ <name>HBASE_CLIENT</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/hbase_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
- </components>
- <configuration-dependencies>
- <config-type>global</config-type>
- <config-type>hbase-site</config-type>
- <config-type>hbase-policy</config-type>
- </configuration-dependencies>
+ </components>
+
+ <osSpecifics>
+ <osSpecific>
+ <osType>centos6</osType>
+ <packages>
+ <package>
+ <type>rpm</type>
+ <name>hbase</name>
+ </package>
+ </packages>
+ </osSpecific>
+ </osSpecifics>
+
+ <commandScript>
+ <script>scripts/service_check.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>300</timeout>
+ </commandScript>
+
+ <configuration-dependencies>
+ <config-type>global</config-type>
+ <config-type>hbase-policy</config-type>
+ <config-type>hbase-site</config-type>
+ </configuration-dependencies>
+
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/92583535/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HCATALOG/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HCATALOG/configuration/global.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HCATALOG/configuration/global.xml
deleted file mode 100644
index b0c7eb6..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HCATALOG/configuration/global.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration>
- <property>
- <name>hcat_log_dir</name>
- <value>/var/log/webhcat</value>
- <description>WebHCat Log Dir.</description>
- </property>
- <property>
- <name>hcat_pid_dir</name>
- <value>/var/run/webhcat</value>
- <description>WebHCat Pid Dir.</description>
- </property>
- <property>
- <name>hcat_user</name>
- <value>hcat</value>
- <description>HCat User.</description>
- </property>
- <property>
- <name>webhcat_user</name>
- <value>hcat</value>
- <description>WebHCat User.</description>
- </property>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/92583535/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HCATALOG/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HCATALOG/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HCATALOG/metainfo.xml
deleted file mode 100644
index 8e78530..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HCATALOG/metainfo.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<metainfo>
- <user>root</user>
- <comment>This is comment for HCATALOG service</comment>
- <version>0.11.0.1.3.3.0</version>
-
- <components>
- <component>
- <name>HCAT</name>
- <category>CLIENT</category>
- </component>
- </components>
-
-</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/92583535/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HDFS/configuration/hdfs-site.xml
index ac76122..1fc6c59 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HDFS/configuration/hdfs-site.xml
@@ -22,7 +22,7 @@
<configuration>
-<!-- file system properties -->
+ <!-- file system properties -->
<property>
<name>dfs.name.dir</name>
@@ -49,7 +49,7 @@
<final>true</final>
</property>
- <property>
+ <property>
<name>dfs.datanode.socket.write.timeout</name>
<value>0</value>
<description>DFS Client write socket timeout</description>
@@ -66,7 +66,7 @@
<name>dfs.block.local-path-access.user</name>
<value>hbase</value>
<description>the user who is allowed to perform short
- circuit reads.
+ circuit reads.
</description>
<final>true</final>
</property>
@@ -75,11 +75,11 @@
<name>dfs.data.dir</name>
<value>/hadoop/hdfs/data</value>
<description>Determines where on the local filesystem an DFS data node
- should store its blocks. If this is a comma-delimited
- list of directories, then data will be stored in all named
- directories, typically on different devices.
- Directories that do not exist are ignored.
- </description>
+ should store its blocks. If this is a comma-delimited
+ list of directories, then data will be stored in all named
+ directories, typically on different devices.
+ Directories that do not exist are ignored.
+ </description>
<final>true</final>
</property>
@@ -87,32 +87,32 @@
<name>dfs.hosts.exclude</name>
<value>/etc/hadoop/conf/dfs.exclude</value>
<description>Names a file that contains a list of hosts that are
- not permitted to connect to the namenode. The full pathname of the
- file must be specified. If the value is empty, no hosts are
- excluded.</description>
+ not permitted to connect to the namenode. The full pathname of the
+ file must be specified. If the value is empty, no hosts are
+ excluded.</description>
</property>
<property>
<name>dfs.hosts</name>
<value>/etc/hadoop/conf/dfs.include</value>
<description>Names a file that contains a list of hosts that are
- permitted to connect to the namenode. The full pathname of the file
- must be specified. If the value is empty, all hosts are
- permitted.</description>
+ permitted to connect to the namenode. The full pathname of the file
+ must be specified. If the value is empty, all hosts are
+ permitted.</description>
</property>
<property>
<name>dfs.replication.max</name>
<value>50</value>
<description>Maximal block replication.
- </description>
+ </description>
</property>
<property>
<name>dfs.replication</name>
<value>3</value>
<description>Default block replication.
- </description>
+ </description>
</property>
<property>
@@ -125,21 +125,21 @@
<name>dfs.safemode.threshold.pct</name>
<value>1.0f</value>
<description>
- Specifies the percentage of blocks that should satisfy
- the minimal replication requirement defined by dfs.replication.min.
- Values less than or equal to 0 mean not to start in safe mode.
- Values greater than 1 will make safe mode permanent.
- </description>
+ Specifies the percentage of blocks that should satisfy
+ the minimal replication requirement defined by dfs.replication.min.
+ Values less than or equal to 0 mean not to start in safe mode.
+ Values greater than 1 will make safe mode permanent.
+ </description>
</property>
<property>
<name>dfs.balance.bandwidthPerSec</name>
<value>6250000</value>
<description>
- Specifies the maximum amount of bandwidth that each datanode
- can utilize for the balancing purpose in term of
- the number of bytes per second.
- </description>
+ Specifies the maximum amount of bandwidth that each datanode
+ can utilize for the balancing purpose in term of
+ the number of bytes per second.
+ </description>
</property>
<property>
@@ -191,133 +191,133 @@
<property>
<name>dfs.http.address</name>
<value>localhost:50070</value>
-<description>The name of the default file system. Either the
-literal string "local" or a host:port for NDFS.</description>
-<final>true</final>
-</property>
-
-<property>
-<name>dfs.datanode.du.reserved</name>
-<!-- cluster variant -->
-<value>1073741824</value>
-<description>Reserved space in bytes per volume. Always leave this much space free for non dfs use.
-</description>
-</property>
-
-<property>
-<name>dfs.datanode.ipc.address</name>
-<value>0.0.0.0:8010</value>
-<description>
-The datanode ipc server address and port.
-If the port is 0 then the server will start on a free port.
-</description>
-</property>
-
-<property>
-<name>dfs.blockreport.initialDelay</name>
-<value>120</value>
-<description>Delay for first block report in seconds.</description>
-</property>
-
-<property>
-<name>dfs.datanode.du.pct</name>
-<value>0.85f</value>
-<description>When calculating remaining space, only use this percentage of the real available space
-</description>
-</property>
-
-<property>
-<name>dfs.namenode.handler.count</name>
-<value>40</value>
-<description>The number of server threads for the namenode.</description>
-</property>
-
-<property>
-<name>dfs.datanode.max.xcievers</name>
-<value>4096</value>
-<description>PRIVATE CONFIG VARIABLE</description>
-</property>
-
-<!-- Permissions configuration -->
-
-<property>
-<name>dfs.umaskmode</name>
-<value>077</value>
-<description>
-The octal umask used when creating files and directories.
-</description>
-</property>
-
-<property>
-<name>dfs.web.ugi</name>
-<!-- cluster variant -->
-<value>gopher,gopher</value>
-<description>The user account used by the web interface.
-Syntax: USERNAME,GROUP1,GROUP2, ...
-</description>
-</property>
-
-<property>
-<name>dfs.permissions</name>
-<value>true</value>
-<description>
-If "true", enable permission checking in HDFS.
-If "false", permission checking is turned off,
-but all other behavior is unchanged.
-Switching from one parameter value to the other does not change the mode,
-owner or group of files or directories.
-</description>
-</property>
-
-<property>
-<name>dfs.permissions.supergroup</name>
-<value>hdfs</value>
-<description>The name of the group of super-users.</description>
-</property>
-
-<property>
-<name>dfs.namenode.handler.count</name>
-<value>100</value>
-<description>Added to grow Queue size so that more client connections are allowed</description>
-</property>
-
-<property>
-<name>ipc.server.max.response.size</name>
-<value>5242880</value>
-</property>
-<property>
-<name>dfs.block.access.token.enable</name>
-<value>true</value>
-<description>
-If "true", access tokens are used as capabilities for accessing datanodes.
-If "false", no access tokens are checked on accessing datanodes.
-</description>
-</property>
-
-<property>
-<name>dfs.namenode.kerberos.principal</name>
-<value></value>
-<description>
-Kerberos principal name for the NameNode
-</description>
-</property>
-
-<property>
-<name>dfs.secondary.namenode.kerberos.principal</name>
-<value></value>
+ <description>The name of the default file system. Either the
+ literal string "local" or a host:port for NDFS.</description>
+ <final>true</final>
+ </property>
+
+ <property>
+ <name>dfs.datanode.du.reserved</name>
+ <!-- cluster variant -->
+ <value>1073741824</value>
+ <description>Reserved space in bytes per volume. Always leave this much space free for non dfs use.
+ </description>
+ </property>
+
+ <property>
+ <name>dfs.datanode.ipc.address</name>
+ <value>0.0.0.0:8010</value>
<description>
- Kerberos principal name for the secondary NameNode.
+ The datanode ipc server address and port.
+ If the port is 0 then the server will start on a free port.
</description>
</property>
+ <property>
+ <name>dfs.blockreport.initialDelay</name>
+ <value>120</value>
+ <description>Delay for first block report in seconds.</description>
+ </property>
+
+ <property>
+ <name>dfs.datanode.du.pct</name>
+ <value>0.85f</value>
+ <description>When calculating remaining space, only use this percentage of the real available space
+ </description>
+ </property>
+
+ <property>
+ <name>dfs.namenode.handler.count</name>
+ <value>40</value>
+ <description>The number of server threads for the namenode.</description>
+ </property>
+
+ <property>
+ <name>dfs.datanode.max.xcievers</name>
+ <value>4096</value>
+ <description>PRIVATE CONFIG VARIABLE</description>
+ </property>
+
+ <!-- Permissions configuration -->
+
+ <property>
+ <name>dfs.umaskmode</name>
+ <value>077</value>
+ <description>
+ The octal umask used when creating files and directories.
+ </description>
+ </property>
+
+ <property>
+ <name>dfs.web.ugi</name>
+ <!-- cluster variant -->
+ <value>gopher,gopher</value>
+ <description>The user account used by the web interface.
+ Syntax: USERNAME,GROUP1,GROUP2, ...
+ </description>
+ </property>
+
+ <property>
+ <name>dfs.permissions</name>
+ <value>true</value>
+ <description>
+ If "true", enable permission checking in HDFS.
+ If "false", permission checking is turned off,
+ but all other behavior is unchanged.
+ Switching from one parameter value to the other does not change the mode,
+ owner or group of files or directories.
+ </description>
+ </property>
+
+ <property>
+ <name>dfs.permissions.supergroup</name>
+ <value>hdfs</value>
+ <description>The name of the group of super-users.</description>
+ </property>
+
+ <property>
+ <name>dfs.namenode.handler.count</name>
+ <value>100</value>
+ <description>Added to grow Queue size so that more client connections are allowed</description>
+ </property>
+
+ <property>
+ <name>ipc.server.max.response.size</name>
+ <value>5242880</value>
+ </property>
+ <property>
+ <name>dfs.block.access.token.enable</name>
+ <value>true</value>
+ <description>
+ If "true", access tokens are used as capabilities for accessing datanodes.
+ If "false", no access tokens are checked on accessing datanodes.
+ </description>
+ </property>
+
+ <property>
+ <name>dfs.namenode.kerberos.principal</name>
+ <value></value>
+ <description>
+ Kerberos principal name for the NameNode
+ </description>
+ </property>
-<!--
- This is KRB DOMAIN specific. The FQDN of the namenode has to be mentioned.
--->
+ <property>
+ <name>dfs.secondary.namenode.kerberos.principal</name>
+ <value></value>
+ <description>
+ Kerberos principal name for the secondary NameNode.
+ </description>
+ </property>
+
+
+ <!--
+ This is KRB DOMAIN specific. The FQDN of the namenode has to be mentioned.
+ -->
<property>
<name>dfs.namenode.kerberos.https.principal</name>
<value></value>
- <description>The Kerberos principal for the host that the NameNode runs on.</description>
+ <description>The Kerberos principal for the host that the NameNode runs on.</description>
</property>
@@ -363,84 +363,84 @@ Kerberos principal name for the NameNode
<property>
<name>dfs.datanode.kerberos.principal</name>
<value></value>
- <description>
- The Kerberos principal that the DataNode runs as. "_HOST" is replaced by the real host name.
+ <description>
+ The Kerberos principal that the DataNode runs as. "_HOST" is replaced by the real host name.
</description>
</property>
<property>
<name>dfs.namenode.keytab.file</name>
<value></value>
- <description>
- Combined keytab file containing the namenode service and host principals.
+ <description>
+ Combined keytab file containing the namenode service and host principals.
</description>
</property>
<property>
<name>dfs.secondary.namenode.keytab.file</name>
<value></value>
- <description>
- Combined keytab file containing the namenode service and host principals.
+ <description>
+ Combined keytab file containing the namenode service and host principals.
</description>
</property>
<property>
<name>dfs.datanode.keytab.file</name>
<value></value>
- <description>
- The filename of the keytab file for the DataNode.
+ <description>
+ The filename of the keytab file for the DataNode.
</description>
</property>
<property>
<name>dfs.https.port</name>
<value>50470</value>
- <description>The https port where namenode binds</description>
+ <description>The https port where namenode binds</description>
</property>
<property>
<name>dfs.https.address</name>
<value>localhost:50470</value>
- <description>The https address where namenode binds</description>
+ <description>The https address where namenode binds</description>
</property>
<property>
<name>dfs.datanode.data.dir.perm</name>
<value>750</value>
-<description>The permissions that should be there on dfs.data.dir
-directories. The datanode will not come up if the permissions are
-different on existing dfs.data.dir directories. If the directories
-don't exist, they will be created with this permission.</description>
- </property>
-
- <property>
- <name>dfs.access.time.precision</name>
- <value>0</value>
- <description>The access time for HDFS file is precise upto this value.
- The default value is 1 hour. Setting a value of 0 disables
- access times for HDFS.
- </description>
-</property>
-
-<property>
- <name>dfs.cluster.administrators</name>
- <value> hdfs</value>
- <description>ACL for who all can view the default servlets in the HDFS</description>
-</property>
-
-<property>
- <name>ipc.server.read.threadpool.size</name>
- <value>5</value>
- <description></description>
-</property>
-
-<property>
- <name>dfs.datanode.failed.volumes.tolerated</name>
- <value>0</value>
- <description>Number of failed disks datanode would tolerate</description>
-</property>
+ <description>The permissions that should be there on dfs.data.dir
+ directories. The datanode will not come up if the permissions are
+ different on existing dfs.data.dir directories. If the directories
+ don't exist, they will be created with this permission.</description>
+ </property>
+
+ <property>
+ <name>dfs.access.time.precision</name>
+ <value>0</value>
+ <description>The access time for HDFS file is precise upto this value.
+ The default value is 1 hour. Setting a value of 0 disables
+ access times for HDFS.
+ </description>
+ </property>
+
+ <property>
+ <name>dfs.cluster.administrators</name>
+ <value> hdfs</value>
+ <description>ACL for who all can view the default servlets in the HDFS</description>
+ </property>
+
+ <property>
+ <name>ipc.server.read.threadpool.size</name>
+ <value>5</value>
+ <description></description>
+ </property>
+
+ <property>
+ <name>dfs.datanode.failed.volumes.tolerated</name>
+ <value>0</value>
+ <description>Number of failed disks datanode would tolerate</description>
+ </property>
<property>
<name>dfs.namenode.avoid.read.stale.datanode</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/92583535/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HDFS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HDFS/metainfo.xml
index 0bbab3e..009acae 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HDFS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HDFS/metainfo.xml
@@ -16,35 +16,131 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Apache Hadoop Distributed File System</comment>
- <version>1.2.0.1.3.3.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>HDFS</name>
+ <comment>Apache Hadoop Distributed File System</comment>
+ <version>1.2.0.1.3.3.0</version>
- <components>
+ <components>
<component>
- <name>NAMENODE</name>
- <category>MASTER</category>
+ <name>NAMENODE</name>
+ <category>MASTER</category>
+ <cardinality>1</cardinality>
+ <commandScript>
+ <script>scripts/namenode.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
+ <customCommands>
+ <customCommand>
+ <name>DECOMMISSION</name>
+ <commandScript>
+ <script>scripts/namenode.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
+ </customCommand>
+ </customCommands>
</component>
<component>
- <name>DATANODE</name>
- <category>SLAVE</category>
+ <name>DATANODE</name>
+ <category>SLAVE</category>
+ <cardinality>1+</cardinality>
+ <commandScript>
+ <script>scripts/datanode.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
<component>
- <name>SECONDARY_NAMENODE</name>
- <category>MASTER</category>
+ <name>SECONDARY_NAMENODE</name>
+ <category>MASTER</category>
+ <cardinality>1</cardinality>
+ <commandScript>
+ <script>scripts/snamenode.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
<component>
- <name>HDFS_CLIENT</name>
- <category>CLIENT</category>
+ <name>HDFS_CLIENT</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/hdfs_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
- </components>
- <configuration-dependencies>
- <config-type>core-site</config-type>
- <config-type>global</config-type>
- <config-type>hdfs-site</config-type>
- <config-type>hadoop-policy</config-type>
- </configuration-dependencies>
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osType>any</osType>
+ <packages>
+ <package>
+ <type>rpm</type>
+ <name>lzo</name>
+ </package>
+ <package>
+ <type>rpm</type>
+ <name>hadoop</name>
+ </package>
+ <package>
+ <type>rpm</type>
+ <name>hadoop-libhdfs</name>
+ </package>
+ <package>
+ <type>rpm</type>
+ <name>hadoop-native</name>
+ </package>
+ <package>
+ <type>rpm</type>
+ <name>hadoop-pipes</name>
+ </package>
+ <package>
+ <type>rpm</type>
+ <name>hadoop-sbin</name>
+ </package>
+ <package>
+ <type>rpm</type>
+ <name>hadoop-lzo</name>
+ </package>
+ <package>
+ <type>rpm</type>
+ <name>hadoop-lzo-native</name>
+ </package>
+ <package>
+ <type>rpm</type>
+ <name>snappy</name>
+ </package>
+ <package>
+ <type>rpm</type>
+ <name>snappy-devel</name>
+ </package>
+ <package>
+ <type>rpm</type>
+ <name>ambari-log4j</name>
+ </package>
+ </packages>
+ </osSpecific>
+ </osSpecifics>
+ <commandScript>
+ <script>scripts/service_check.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>300</timeout>
+ </commandScript>
+
+ <configuration-dependencies>
+ <config-type>core-site</config-type>
+ <config-type>global</config-type>
+ <config-type>hdfs-site</config-type>
+ <config-type>hadoop-policy</config-type>
+ </configuration-dependencies>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/92583535/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HIVE/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HIVE/configuration/global.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HIVE/configuration/global.xml
index d9adc80..ae7f586 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HIVE/configuration/global.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HIVE/configuration/global.xml
@@ -121,5 +121,28 @@
<value>hive</value>
<description>Hive User.</description>
</property>
+
+ <!--HCAT-->
+
+ <property>
+ <name>hcat_log_dir</name>
+ <value>/var/log/webhcat</value>
+ <description>WebHCat Log Dir.</description>
+ </property>
+ <property>
+ <name>hcat_pid_dir</name>
+ <value>/etc/run/webhcat</value>
+ <description>WebHCat Pid Dir.</description>
+ </property>
+ <property>
+ <name>hcat_user</name>
+ <value>hcat</value>
+ <description>HCat User.</description>
+ </property>
+ <property>
+ <name>webhcat_user</name>
+ <value>hcat</value>
+ <description>WebHCat User.</description>
+ </property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/92583535/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HIVE/configuration/hive-site.xml
index 24de30b..29ed54e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HIVE/configuration/hive-site.xml
@@ -58,21 +58,21 @@ limitations under the License.
<name>hive.metastore.sasl.enabled</name>
<value></value>
<description>If true, the metastore thrift interface will be secured with SASL.
- Clients must authenticate with Kerberos.</description>
+ Clients must authenticate with Kerberos.</description>
</property>
<property>
<name>hive.metastore.kerberos.keytab.file</name>
<value></value>
<description>The path to the Kerberos Keytab file containing the metastore
- thrift server's service principal.</description>
+ thrift server's service principal.</description>
</property>
<property>
<name>hive.metastore.kerberos.principal</name>
<value></value>
<description>The service principal for the metastore thrift server. The special
- string _HOST will be replaced automatically with the correct host name.</description>
+ string _HOST will be replaced automatically with the correct host name.</description>
</property>
<property>
@@ -115,7 +115,7 @@ limitations under the License.
<name>hive.security.authorization.manager</name>
<value>org.apache.hcatalog.security.HdfsAuthorizationProvider</value>
<description>the hive client authorization manager class name.
- The user defined authorization class should implement interface org.apache.hadoop.hive.ql.security.authorization.HiveAuthorizationProvider. </description>
+ The user defined authorization class should implement interface org.apache.hadoop.hive.ql.security.authorization.HiveAuthorizationProvider. </description>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/92583535/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HIVE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HIVE/metainfo.xml
index afeaae1..0a0f8fa 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HIVE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HIVE/metainfo.xml
@@ -16,30 +16,171 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Data warehouse system for ad-hoc queries & analysis of large datasets and table & storage management service</comment>
- <version>0.11.0.1.3.3.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>HIVE</name>
+ <comment>Data warehouse system for ad-hoc queries & analysis of large datasets and table & storage management service</comment>
+ <version>0.11.0.1.3.3.0</version>
+ <components>
- <components>
<component>
- <name>HIVE_METASTORE</name>
- <category>MASTER</category>
+ <name>HIVE_METASTORE</name>
+ <category>MASTER</category>
+ <!-- may be 0 if specifying external metastore, how to specify this? -->
+ <cardinality>1</cardinality>
+ <auto-deploy>
+ <enabled>true</enabled>
+ <co-locate>HIVE/HIVE_SERVER</co-locate>
+ </auto-deploy>
+ <commandScript>
+ <script>scripts/hive_metastore.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
+
+ <component>
+ <name>HIVE_SERVER</name>
+ <category>MASTER</category>
+ <cardinality>1</cardinality>
+ <dependencies>
+ <dependency>
+ <name>ZOOKEEPER/ZOOKEEPER_SERVER</name>
+ <scope>cluster</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ <co-locate>HIVE/HIVE_SERVER</co-locate>
+ </auto-deploy>
+ </dependency>
+ </dependencies>
+ <commandScript>
+ <script>scripts/hive_server.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
+ </component>
+
<component>
- <name>HIVE_SERVER</name>
- <category>MASTER</category>
+ <name>MYSQL_SERVER</name>
+ <category>MASTER</category>
+ <!-- may be 0 if specifying external db, how to specify this? -->
+ <cardinality>1</cardinality>
+ <auto-deploy>
+ <enabled>true</enabled>
+ <co-locate>HIVE/HIVE_SERVER</co-locate>
+ </auto-deploy>
+ <commandScript>
+ <script>scripts/mysql_server.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
+
<component>
- <name>MYSQL_SERVER</name>
- <category>MASTER</category>
+ <name>HIVE_CLIENT</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/hive_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
+ </components>
+
+ <osSpecifics>
+ <osSpecific>
+ <osType>any</osType>
+ <packages>
+ <package>
+ <type>rpm</type>
+ <name>hive</name>
+ </package>
+ <package>
+ <type>rpm</type>
+ <name>mysql-connector-java</name>
+ </package>
+ <package>
+ <type>rpm</type>
+ <name>mysql</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osType>centos6</osType>
+ <packages>
+ <package>
+ <type>rpm</type>
+ <name>mysql-server</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osType>centos5</osType>
+ <packages>
+ <package>
+ <type>rpm</type>
+ <name>mysql-server</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osType>suse</osType>
+ <packages>
+ <package>
+ <type>rpm</type>
+ <name>mysql-client</name>
+ </package>
+ </packages>
+ </osSpecific>
+ </osSpecifics>
+
+ <commandScript>
+ <script>scripts/service_check.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>300</timeout>
+ </commandScript>
+
+ <configuration-dependencies>
+ <config-type>hive-site</config-type>
+ <config-type>global</config-type>
+ </configuration-dependencies>
+ </service>
+
+ <service>
+ <name>HCATALOG</name>
+ <comment>This is comment for HCATALOG service</comment>
+ <version>0.11.0.1.3.3.0</version>
+ <components>
<component>
- <name>HIVE_CLIENT</name>
- <category>CLIENT</category>
+ <name>HCAT</name>
+ <category>CLIENT</category>
+ <commandScript>
+ <script>scripts/hcat_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
- </components>
- <configuration-dependencies>
- <config-type>global</config-type>
- <config-type>hive-site</config-type>
- </configuration-dependencies>
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osType>any</osType>
+ <packages>
+ <package>
+ <type>rpm</type>
+ <name>hcatalog</name>
+ </package>
+ </packages>
+ </osSpecific>
+ </osSpecifics>
+ <commandScript>
+ <script>scripts/service_check.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>300</timeout>
+ </commandScript>
+
+ <configuration-dependencies>
+ <config-type>global</config-type>
+ </configuration-dependencies>
+
+ </service>
+
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/92583535/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HUE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HUE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HUE/metainfo.xml
index ba580ca..0a6b59e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HUE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/HUE/metainfo.xml
@@ -25,6 +25,7 @@
<component>
<name>HUE_SERVER</name>
<category>MASTER</category>
+ <cardinality>1</cardinality>
</component>
</components>
http://git-wip-us.apache.org/repos/asf/ambari/blob/92583535/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/MAPREDUCE/configuration/mapred-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/MAPREDUCE/configuration/mapred-site.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/MAPREDUCE/configuration/mapred-site.xml
index c4f6e39..1db37a8 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/MAPREDUCE/configuration/mapred-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/MAPREDUCE/configuration/mapred-site.xml
@@ -22,7 +22,7 @@
<configuration xmlns:xi="http://www.w3.org/2001/XInclude">
-<!-- i/o properties -->
+ <!-- i/o properties -->
<property>
<name>io.sort.mb</name>
@@ -50,25 +50,25 @@
<description>No description</description>
</property>
-<!-- map/reduce properties -->
+ <!-- map/reduce properties -->
-<property>
- <name>mapred.tasktracker.tasks.sleeptime-before-sigkill</name>
- <value>250</value>
- <description>Normally, this is the amount of time before killing
- processes, and the recommended-default is 5.000 seconds - a value of
- 5000 here. In this case, we are using it solely to blast tasks before
- killing them, and killing them very quickly (1/4 second) to guarantee
- that we do not leave VMs around for later jobs.
- </description>
-</property>
+ <property>
+ <name>mapred.tasktracker.tasks.sleeptime-before-sigkill</name>
+ <value>250</value>
+ <description>Normally, this is the amount of time before killing
+ processes, and the recommended-default is 5.000 seconds - a value of
+ 5000 here. In this case, we are using it solely to blast tasks before
+ killing them, and killing them very quickly (1/4 second) to guarantee
+ that we do not leave VMs around for later jobs.
+ </description>
+ </property>
<property>
<name>mapred.job.tracker.handler.count</name>
<value>50</value>
<description>
- The number of server threads for the JobTracker. This should be roughly
- 4% of the number of tasktracker nodes.
+ The number of server threads for the JobTracker. This should be roughly
+ 4% of the number of tasktracker nodes.
</description>
</property>
@@ -104,8 +104,8 @@
</property>
<property>
- <name>mapreduce.cluster.administrators</name>
- <value> hadoop</value>
+ <name>mapreduce.cluster.administrators</name>
+ <value> hadoop</value>
</property>
<property>
@@ -135,14 +135,14 @@
<name>mapred.map.tasks.speculative.execution</name>
<value>false</value>
<description>If true, then multiple instances of some map tasks
- may be executed in parallel.</description>
+ may be executed in parallel.</description>
</property>
<property>
<name>mapred.reduce.tasks.speculative.execution</name>
<value>false</value>
<description>If true, then multiple instances of some reduce tasks
- may be executed in parallel.</description>
+ may be executed in parallel.</description>
</property>
<property>
@@ -154,29 +154,29 @@
<name>mapred.inmem.merge.threshold</name>
<value>1000</value>
<description>The threshold, in terms of the number of files
- for the in-memory merge process. When we accumulate threshold number of files
- we initiate the in-memory merge and spill to disk. A value of 0 or less than
- 0 indicates we want to DON'T have any threshold and instead depend only on
- the ramfs's memory consumption to trigger the merge.
- </description>
+ for the in-memory merge process. When we accumulate threshold number of files
+ we initiate the in-memory merge and spill to disk. A value of 0 or less than
+ 0 indicates we want to DON'T have any threshold and instead depend only on
+ the ramfs's memory consumption to trigger the merge.
+ </description>
</property>
<property>
<name>mapred.job.shuffle.merge.percent</name>
<value>0.66</value>
<description>The usage threshold at which an in-memory merge will be
- initiated, expressed as a percentage of the total memory allocated to
- storing in-memory map outputs, as defined by
- mapred.job.shuffle.input.buffer.percent.
- </description>
+ initiated, expressed as a percentage of the total memory allocated to
+ storing in-memory map outputs, as defined by
+ mapred.job.shuffle.input.buffer.percent.
+ </description>
</property>
<property>
<name>mapred.job.shuffle.input.buffer.percent</name>
<value>0.7</value>
<description>The percentage of memory to be allocated from the maximum heap
- size to storing map outputs during the shuffle.
- </description>
+ size to storing map outputs during the shuffle.
+ </description>
</property>
<property>
@@ -187,13 +187,13 @@
</description>
</property>
-<property>
- <name>mapred.output.compression.type</name>
- <value>BLOCK</value>
- <description>If the job outputs are to compressed as SequenceFiles, how should
- they be compressed? Should be one of NONE, RECORD or BLOCK.
- </description>
-</property>
+ <property>
+ <name>mapred.output.compression.type</name>
+ <value>BLOCK</value>
+ <description>If the job outputs are to compressed as SequenceFiles, how should
+ they be compressed? Should be one of NONE, RECORD or BLOCK.
+ </description>
+ </property>
<property>
@@ -210,7 +210,7 @@
<name>mapred.jobtracker.restart.recover</name>
<value>false</value>
<description>"true" to enable (job) recovery upon restart,
- "false" to start afresh
+ "false" to start afresh
</description>
</property>
@@ -218,20 +218,20 @@
<name>mapred.job.reduce.input.buffer.percent</name>
<value>0.0</value>
<description>The percentage of memory- relative to the maximum heap size- to
- retain map outputs during the reduce. When the shuffle is concluded, any
- remaining map outputs in memory must consume less than this threshold before
- the reduce can begin.
- </description>
+ retain map outputs during the reduce. When the shuffle is concluded, any
+ remaining map outputs in memory must consume less than this threshold before
+ the reduce can begin.
+ </description>
</property>
- <property>
- <name>mapreduce.reduce.input.limit</name>
- <value>10737418240</value>
- <description>The limit on the input size of the reduce. (This value
- is 10 Gb.) If the estimated input size of the reduce is greater than
- this value, job is failed. A value of -1 means that there is no limit
- set. </description>
-</property>
+ <property>
+ <name>mapreduce.reduce.input.limit</name>
+ <value>10737418240</value>
+ <description>The limit on the input size of the reduce. (This value
+ is 10 Gb.) If the estimated input size of the reduce is greater than
+ this value, job is failed. A value of -1 means that there is no limit
+ set. </description>
+ </property>
<!-- copied from kryptonite configuration -->
@@ -245,9 +245,9 @@
<name>mapred.task.timeout</name>
<value>600000</value>
<description>The number of milliseconds before a task will be
- terminated if it neither reads an input, writes an output, nor
- updates its status string.
- </description>
+ terminated if it neither reads an input, writes an output, nor
+ updates its status string.
+ </description>
</property>
<property>
@@ -259,9 +259,9 @@
<property>
<name>mapred.task.tracker.task-controller</name>
<value>org.apache.hadoop.mapred.DefaultTaskController</value>
- <description>
- TaskController which is used to launch and manage task execution.
- </description>
+ <description>
+ TaskController which is used to launch and manage task execution.
+ </description>
</property>
<property>
@@ -279,7 +279,6 @@
<property>
<name>mapred.child.java.opts</name>
<value>-server -Xmx${ambari.mapred.child.java.opts.memory}m -Djava.net.preferIPv4Stack=true</value>
-
<description>Java options for the TaskTracker child processes</description>
</property>
@@ -295,7 +294,7 @@
<name>mapred.cluster.reduce.memory.mb</name>
<value>2048</value>
<description>
- The virtual memory size of a single Reduce slot in the MapReduce framework
+ The virtual memory size of a single Reduce slot in the MapReduce framework
</description>
</property>
@@ -331,147 +330,147 @@
</description>
</property>
-<property>
- <name>mapred.hosts</name>
- <value>/etc/hadoop/conf/mapred.include</value>
- <description>
- Names a file that contains the list of nodes that may
- connect to the jobtracker. If the value is empty, all hosts are
- permitted.
- </description>
-</property>
-
-<property>
- <name>mapred.hosts.exclude</name>
- <value>/etc/hadoop/conf/mapred.exclude</value>
- <description>
- Names a file that contains the list of hosts that
- should be excluded by the jobtracker. If the value is empty, no
- hosts are excluded.
- </description>
-</property>
-
-<property>
- <name>mapred.max.tracker.blacklists</name>
- <value>16</value>
- <description>
- if node is reported blacklisted by 16 successful jobs within timeout-window, it will be graylisted
- </description>
-</property>
-
-<property>
- <name>mapred.healthChecker.script.path</name>
- <value>/etc/hadoop/conf/health_check</value>
- <description>
- Directory path to view job status
- </description>
-</property>
-
-<property>
- <name>mapred.healthChecker.interval</name>
- <value>135000</value>
-</property>
-
-<property>
- <name>mapred.healthChecker.script.timeout</name>
- <value>60000</value>
-</property>
-
-<property>
- <name>mapred.job.tracker.persist.jobstatus.active</name>
- <value>false</value>
- <description>Indicates if persistency of job status information is
- active or not.
- </description>
-</property>
-
-<property>
- <name>mapred.job.tracker.persist.jobstatus.hours</name>
- <value>1</value>
- <description>The number of hours job status information is persisted in DFS.
- The job status information will be available after it drops of the memory
- queue and between jobtracker restarts. With a zero value the job status
- information is not persisted at all in DFS.
- </description>
-</property>
-
-<property>
- <name>mapred.job.tracker.persist.jobstatus.dir</name>
- <value>/mapred/jobstatus</value>
- <description>The directory where the job status information is persisted
- in a file system to be available after it drops of the memory queue and
- between jobtracker restarts.
- </description>
-</property>
-
-<property>
- <name>mapred.jobtracker.retirejob.check</name>
- <value>10000</value>
-</property>
-
-<property>
- <name>mapred.jobtracker.retirejob.interval</name>
- <value>21600000</value>
-</property>
-
-<property>
- <name>mapred.job.tracker.history.completed.location</name>
- <value>/mapred/history/done</value>
- <description>No description</description>
-</property>
-
-<property>
- <name>mapred.task.maxvmem</name>
- <value></value>
- <final>true</final>
- <description>No description</description>
-</property>
-
-<property>
- <name>mapred.jobtracker.maxtasks.per.job</name>
- <value>-1</value>
- <final>true</final>
- <description>The maximum number of tasks for a single job.
- A value of -1 indicates that there is no maximum. </description>
-</property>
-
-<property>
- <name>mapreduce.fileoutputcommitter.marksuccessfuljobs</name>
- <value>false</value>
-</property>
-
-<property>
- <name>mapred.userlog.retain.hours</name>
- <value>24</value>
- <description>
- The maximum time, in hours, for which the user-logs are to be retained after the job completion.
- </description>
-</property>
-
-<property>
- <name>mapred.job.reuse.jvm.num.tasks</name>
- <value>1</value>
- <description>
- How many tasks to run per jvm. If set to -1, there is no limit
- </description>
- <final>true</final>
-</property>
-
-<property>
- <name>mapreduce.jobtracker.kerberos.principal</name>
- <value></value>
- <description>
+ <property>
+ <name>mapred.hosts</name>
+ <value>/etc/hadoop/conf/mapred.include</value>
+ <description>
+ Names a file that contains the list of nodes that may
+ connect to the jobtracker. If the value is empty, all hosts are
+ permitted.
+ </description>
+ </property>
+
+ <property>
+ <name>mapred.hosts.exclude</name>
+ <value>/etc/hadoop/conf/mapred.exclude</value>
+ <description>
+ Names a file that contains the list of hosts that
+ should be excluded by the jobtracker. If the value is empty, no
+ hosts are excluded.
+ </description>
+ </property>
+
+ <property>
+ <name>mapred.max.tracker.blacklists</name>
+ <value>16</value>
+ <description>
+ if node is reported blacklisted by 16 successful jobs within timeout-window, it will be graylisted
+ </description>
+ </property>
+
+ <property>
+ <name>mapred.healthChecker.script.path</name>
+ <value>/etc/hadoop/conf/health_check</value>
+ <description>
+ Directory path to view job status
+ </description>
+ </property>
+
+ <property>
+ <name>mapred.healthChecker.interval</name>
+ <value>135000</value>
+ </property>
+
+ <property>
+ <name>mapred.healthChecker.script.timeout</name>
+ <value>60000</value>
+ </property>
+
+ <property>
+ <name>mapred.job.tracker.persist.jobstatus.active</name>
+ <value>false</value>
+ <description>Indicates if persistency of job status information is
+ active or not.
+ </description>
+ </property>
+
+ <property>
+ <name>mapred.job.tracker.persist.jobstatus.hours</name>
+ <value>1</value>
+ <description>The number of hours job status information is persisted in DFS.
+ The job status information will be available after it drops of the memory
+ queue and between jobtracker restarts. With a zero value the job status
+ information is not persisted at all in DFS.
+ </description>
+ </property>
+
+ <property>
+ <name>mapred.job.tracker.persist.jobstatus.dir</name>
+ <value>/mapred/jobstatus</value>
+ <description>The directory where the job status information is persisted
+ in a file system to be available after it drops of the memory queue and
+ between jobtracker restarts.
+ </description>
+ </property>
+
+ <property>
+ <name>mapred.jobtracker.retirejob.check</name>
+ <value>10000</value>
+ </property>
+
+ <property>
+ <name>mapred.jobtracker.retirejob.interval</name>
+ <value>21600000</value>
+ </property>
+
+ <property>
+ <name>mapred.job.tracker.history.completed.location</name>
+ <value>/mapred/history/done</value>
+ <description>No description</description>
+ </property>
+
+ <property>
+ <name>mapred.task.maxvmem</name>
+ <value></value>
+ <final>true</final>
+ <description>No description</description>
+ </property>
+
+ <property>
+ <name>mapred.jobtracker.maxtasks.per.job</name>
+ <value>-1</value>
+ <final>true</final>
+ <description>The maximum number of tasks for a single job.
+ A value of -1 indicates that there is no maximum. </description>
+ </property>
+
+ <property>
+ <name>mapreduce.fileoutputcommitter.marksuccessfuljobs</name>
+ <value>false</value>
+ </property>
+
+ <property>
+ <name>mapred.userlog.retain.hours</name>
+ <value>24</value>
+ <description>
+ The maximum time, in hours, for which the user-logs are to be retained after the job completion.
+ </description>
+ </property>
+
+ <property>
+ <name>mapred.job.reuse.jvm.num.tasks</name>
+ <value>1</value>
+ <description>
+ How many tasks to run per jvm. If set to -1, there is no limit
+ </description>
+ <final>true</final>
+ </property>
+
+ <property>
+ <name>mapreduce.jobtracker.kerberos.principal</name>
+ <value></value>
+ <description>
JT user name key.
- </description>
-</property>
+ </description>
+ </property>
-<property>
- <name>mapreduce.tasktracker.kerberos.principal</name>
- <value></value>
- <description>
- tt user name key. "_HOST" is replaced by the host name of the task tracker.
- </description>
-</property>
+ <property>
+ <name>mapreduce.tasktracker.kerberos.principal</name>
+ <value></value>
+ <description>
+ tt user name key. "_HOST" is replaced by the host name of the task tracker.
+ </description>
+ </property>
<property>
@@ -481,54 +480,54 @@
</property>
- <property>
- <name>mapreduce.jobtracker.keytab.file</name>
- <value></value>
- <description>
- The keytab for the jobtracker principal.
- </description>
+ <property>
+ <name>mapreduce.jobtracker.keytab.file</name>
+ <value></value>
+ <description>
+ The keytab for the jobtracker principal.
+ </description>
-</property>
+ </property>
- <property>
- <name>mapreduce.tasktracker.keytab.file</name>
- <value></value>
+ <property>
+ <name>mapreduce.tasktracker.keytab.file</name>
+ <value></value>
<description>The filename of the keytab for the task tracker</description>
- </property>
+ </property>
- <property>
- <name>mapred.task.tracker.http.address</name>
- <value></value>
- <description>Http address for task tracker.</description>
- </property>
+ <property>
+ <name>mapred.task.tracker.http.address</name>
+ <value></value>
+ <description>Http address for task tracker.</description>
+ </property>
- <property>
- <name>mapreduce.jobtracker.staging.root.dir</name>
- <value>/user</value>
- <description>The Path prefix for where the staging directories should be placed. The next level is always the user's
- name. It is a path in the default file system.</description>
- </property>
+ <property>
+ <name>mapreduce.jobtracker.staging.root.dir</name>
+ <value>/user</value>
+ <description>The Path prefix for where the staging directories should be placed. The next level is always the user's
+ name. It is a path in the default file system.</description>
+ </property>
- <property>
- <name>mapreduce.tasktracker.group</name>
- <value>hadoop</value>
- <description>The group that the task controller uses for accessing the task controller. The mapred user must be a member and users should *not* be members.</description>
+ <property>
+ <name>mapreduce.tasktracker.group</name>
+ <value>hadoop</value>
+ <description>The group that the task controller uses for accessing the task controller. The mapred user must be a member and users should *not* be members.</description>
- </property>
+ </property>
<property>
<name>mapreduce.jobtracker.split.metainfo.maxsize</name>
<value>50000000</value>
<final>true</final>
- <description>If the size of the split metainfo file is larger than this, the JobTracker will fail the job during
- initialize.
- </description>
+ <description>If the size of the split metainfo file is larger than this, the JobTracker will fail the job during
+ initialize.
+ </description>
</property>
<property>
<name>mapreduce.history.server.embedded</name>
<value>false</value>
<description>Should job history server be embedded within Job tracker
-process</description>
+ process</description>
<final>true</final>
</property>
@@ -543,61 +542,60 @@ process</description>
<property>
<name>mapreduce.jobhistory.kerberos.principal</name>
<!-- cluster variant -->
- <value></value>
+ <value></value>
<description>Job history user name key. (must map to same user as JT
-user)</description>
+ user)</description>
</property>
- <property>
- <name>mapreduce.jobhistory.keytab.file</name>
+ <property>
+ <name>mapreduce.jobhistory.keytab.file</name>
<!-- cluster variant -->
- <value></value>
- <description>The keytab for the job history server principal.</description>
- </property>
-
-<property>
- <name>mapred.jobtracker.blacklist.fault-timeout-window</name>
- <value>180</value>
- <description>
- 3-hour sliding window (value is in minutes)
- </description>
-</property>
-
-<property>
- <name>mapred.jobtracker.blacklist.fault-bucket-width</name>
- <value>15</value>
- <description>
- 15-minute bucket size (value is in minutes)
- </description>
-</property>
-
-<property>
- <name>mapred.queue.names</name>
- <value>default</value>
- <description> Comma separated list of queues configured for this jobtracker.</description>
-</property>
+ <value></value>
+ <description>The keytab for the job history server principal.</description>
+ </property>
+ <property>
+ <name>mapred.jobtracker.blacklist.fault-timeout-window</name>
+ <value>180</value>
+ <description>
+ 3-hour sliding window (value is in minutes)
+ </description>
+ </property>
+
+ <property>
+ <name>mapred.jobtracker.blacklist.fault-bucket-width</name>
+ <value>15</value>
+ <description>
+ 15-minute bucket size (value is in minutes)
+ </description>
+ </property>
+
+ <property>
+ <name>mapred.queue.names</name>
+ <value>default</value>
+ <description> Comma separated list of queues configured for this jobtracker.</description>
+ </property>
-<property>
- <name>mapreduce.jobhistory.intermediate-done-dir</name>
- <value>/mr-history/tmp</value>
- <description>
- Directory where history files are written by MapReduce jobs.
- </description>
-</property>
-
-<property>
- <name>mapreduce.jobhistory.done-dir</name>
- <value>/mr-history/done</value>
- <description>
- Directory where history files are managed by the MR JobHistory Server.
- </description>
-</property>
-
-<property>
- <name>mapreduce.jobhistory.webapp.address</name>
- <value>localhost:19888</value>
- <description>Enter your JobHistoryServer hostname.</description>
-</property>
+ <property>
+ <name>mapreduce.jobhistory.intermediate-done-dir</name>
+ <value>/mr-history/tmp</value>
+ <description>
+ Directory where history files are written by MapReduce jobs.
+ </description>
+ </property>
+
+ <property>
+ <name>mapreduce.jobhistory.done-dir</name>
+ <value>/mr-history/done</value>
+ <description>
+ Directory where history files are managed by the MR JobHistory Server.
+ </description>
+ </property>
+
+ <property>
+ <name>mapreduce.jobhistory.webapp.address</name>
+ <value>localhost:19888</value>
+ <description>Enter your JobHistoryServer hostname.</description>
+ </property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/92583535/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/MAPREDUCE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/MAPREDUCE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/MAPREDUCE/metainfo.xml
index 2493a13..71783d7 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/MAPREDUCE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.3/services/MAPREDUCE/metainfo.xml
@@ -15,30 +15,88 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<metainfo>
- <user>mapred</user>
- <comment>Apache Hadoop Distributed Processing Framework</comment>
- <version>1.2.0.1.3.3.0</version>
- <components>
+<metainfo>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>MAPREDUCE</name>
+ <comment>Apache Hadoop Distributed Processing Framework</comment>
+ <version>1.2.0.1.3.3.0</version>
+ <components>
<component>
- <name>JOBTRACKER</name>
- <category>MASTER</category>
+ <name>JOBTRACKER</name>
+ <category>MASTER</category>
+ <cardinality>1</cardinality>
+ <commandScript>
+ <script>scripts/jobtracker.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
+ <customCommands>
+ <customCommand>
+ <name>DECOMMISSION</name>
+ <commandScript>
+ <script>scripts/jobtracker.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
+ </customCommand>
+ </customCommands>
</component>
<component>
- <name>TASKTRACKER</name>
- <category>SLAVE</category>
+ <name>TASKTRACKER</name>
+ <category>SLAVE</category>
+ <cardinality>1+</cardinality>
+ <commandScript>
+ <script>scripts/tasktracker.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
<component>
- <name>MAPREDUCE_CLIENT</name>
- <category>CLIENT</category>
+ <name>MAPREDUCE_CLIENT</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/client.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
+ </component>
+
+ <component>
+ <name>HISTORYSERVER</name>
+ <category>MASTER</category>
+ <cardinality>1</cardinality>
+ <auto-deploy>
+ <enabled>true</enabled>
+ <co-locate>MAPREDUCE/JOBTRACKER</co-locate>
+ </auto-deploy>
+ <commandScript>
+ <script>scripts/historyserver.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
- </components>
- <configuration-dependencies>
- <config-type>core-site</config-type>
- <config-type>global</config-type>
- <config-type>mapred-site</config-type>
- </configuration-dependencies>
+ </components>
+
+ <commandScript>
+ <script>scripts/service_check.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>300</timeout>
+ </commandScript>
+
+ <configuration-dependencies>
+ <config-type>capacity-scheduler</config-type>
+ <config-type>core-site</config-type>
+ <config-type>global</config-type>
+ <config-type>mapred-site</config-type>
+ <config-type>mapred-queue-acls</config-type>
+ </configuration-dependencies>
+ </service>
+
+ </services>
</metainfo>