Repository: ambari Updated Branches: refs/heads/branch-windows-dev fd51370a2 -> 588a2cfc4
AMBARI-7850. Choose Services Wizard Step doesn't display service names for HDPWIN 2.1. (Jayush Luniya via yusaku) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/588a2cfc Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/588a2cfc Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/588a2cfc Branch: refs/heads/branch-windows-dev Commit: 588a2cfc4a12b2a2d3820a31ecb8db5d20a33c3c Parents: fd51370 Author: Yusaku Sako <[email protected]> Authored: Mon Oct 20 14:37:49 2014 -0700 Committer: Yusaku Sako <[email protected]> Committed: Mon Oct 20 14:37:49 2014 -0700 ---------------------------------------------------------------------- .../HDPWIN/2.1/services/FALCON/metainfo.xml | 48 +++++--- .../HDPWIN/2.1/services/HBASE/metainfo.xml | 40 +++++-- .../HDPWIN/2.1/services/HDFS/metainfo.xml | 65 ++++++++-- .../HDPWIN/2.1/services/OOZIE/metainfo.xml | 34 +++++- .../stacks/HDPWIN/2.1/services/PIG/metainfo.xml | 30 ++++- .../HDPWIN/2.1/services/SQOOP/metainfo.xml | 21 +++- .../HDPWIN/2.1/services/STORM/metainfo.xml | 42 ++++++- .../stacks/HDPWIN/2.1/services/TEZ/metainfo.xml | 25 +++- .../HDPWIN/2.1/services/YARN/metainfo.xml | 118 +++++++++++++------ .../HDPWIN/2.1/services/ZOOKEEPER/metainfo.xml | 27 ++++- 10 files changed, 353 insertions(+), 97 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/588a2cfc/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/metainfo.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/metainfo.xml index b4e816d..bfc0aaa 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/FALCON/metainfo.xml @@ -20,21 +20,41 @@ <services> <service> <name>FALCON</name> + <displayName>Falcon</displayName> <comment>Data management and processing platform</comment> <version>0.5.0.2.1</version> <components> <component> <name>FALCON_CLIENT</name> + <displayName>Falcon Client</displayName> <category>CLIENT</category> - <cardinality>0+</cardinality> + <cardinality>1+</cardinality> <commandScript> <script>scripts/falcon_client.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>600</timeout> </commandScript> + <configFiles> + <configFile> + <type>env</type> + <fileName>falcon-env.cmd</fileName> + <dictionaryName>falcon-env</dictionaryName> + </configFile> + <configFile> + <type>xml</type> + <fileName>runtime.properties</fileName> + <dictionaryName>falcon-runtime.properties</dictionaryName> + </configFile> + <configFile> + <type>xml</type> + <fileName>startup.properties</fileName> + <dictionaryName>falcon-startup.properties</dictionaryName> + </configFile> + </configFiles> </component> <component> <name>FALCON_SERVER</name> + <displayName>Falcon Server</displayName> <category>MASTER</category> <cardinality>1</cardinality> <dependencies> @@ -56,35 +76,31 @@ <commandScript> <script>scripts/falcon_server.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>600</timeout> </commandScript> </component> </components> - <osSpecifics> - <osSpecific> - <osFamily>any</osFamily> - <packages> - <package> - <name>falcon</name> - </package> - </packages> - </osSpecific> - </osSpecifics> - <commandScript> <script>scripts/service_check.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>300</timeout> </commandScript> + + <requiredServices> + <service>OOZIE</service> + </requiredServices> <configuration-dependencies> - <config-type>oozie-site</config-type> <config-type>falcon-env</config-type> <config-type>falcon-startup.properties</config-type> <config-type>falcon-runtime.properties</config-type> </configuration-dependencies> + <excluded-config-types> + <config-type>oozie-site</config-type> + </excluded-config-types> + </service> </services> </metainfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/588a2cfc/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/metainfo.xml index 7e955a1..38ce3b6 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HBASE/metainfo.xml @@ -20,6 +20,7 @@ <services> <service> <name>HBASE</name> + <displayName>HBase</displayName> <comment>Non-relational distributed database and centralized service for configuration management & synchronization </comment> @@ -27,8 +28,9 @@ <components> <component> <name>HBASE_MASTER</name> + <displayName>HBase Master</displayName> <category>MASTER</category> - <cardinality>1</cardinality> + <cardinality>1+</cardinality> <dependencies> <dependency> <name>HDFS/HDFS_CLIENT</name> @@ -49,7 +51,7 @@ <commandScript> <script>scripts/hbase_master.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>600</timeout> </commandScript> <customCommands> <customCommand> @@ -57,7 +59,7 @@ <commandScript> <script>scripts/hbase_master.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>600</timeout> </commandScript> </customCommand> </customCommands> @@ -65,6 +67,7 @@ <component> <name>HBASE_REGIONSERVER</name> + <displayName>RegionServer</displayName> <category>SLAVE</category> <cardinality>1+</cardinality> <commandScript> @@ -75,26 +78,49 @@ <component> <name>HBASE_CLIENT</name> + <displayName>HBase Client</displayName> <category>CLIENT</category> - <cardinality>0+</cardinality> + <cardinality>1+</cardinality> <commandScript> <script>scripts/hbase_client.py</script> <scriptType>PYTHON</scriptType> </commandScript> + <configFiles> + <configFile> + <type>xml</type> + <fileName>hbase-site.xml</fileName> + <dictionaryName>hbase-site</dictionaryName> + </configFile> + <configFile> + <type>env</type> + <fileName>hbase-env.cmd</fileName> + <dictionaryName>hbase-env</dictionaryName> + </configFile> + <configFile> + <type>env</type> + <fileName>log4j.properties</fileName> + <dictionaryName>hbase-log4j</dictionaryName> + </configFile> + </configFiles> </component> </components> <commandScript> <script>scripts/service_check.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>300</timeout> </commandScript> + + <requiredServices> + <service>ZOOKEEPER</service> + <service>HDFS</service> + </requiredServices> <configuration-dependencies> - <!--<config-type>global</config-type>--> <config-type>hbase-policy</config-type> <config-type>hbase-site</config-type> - <!--<config-type>hbase-log4j</config-type>--> + <config-type>hbase-env</config-type> + <config-type>hbase-log4j</config-type> </configuration-dependencies> </service> http://git-wip-us.apache.org/repos/asf/ambari/blob/588a2cfc/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/metainfo.xml index 3e7f90f..8f0daff 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/metainfo.xml @@ -20,18 +20,20 @@ <services> <service> <name>HDFS</name> + <displayName>HDFS</displayName> <comment>Apache Hadoop Distributed File System</comment> <version>2.1.0.2.0</version> <components> <component> <name>NAMENODE</name> + <displayName>NameNode</displayName> <category>MASTER</category> - <cardinality>1</cardinality> + <cardinality>1-2</cardinality> <commandScript> <script>scripts/namenode.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>600</timeout> </commandScript> <customCommands> <customCommand> @@ -39,7 +41,15 @@ <commandScript> <script>scripts/namenode.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>600</timeout> + </commandScript> + </customCommand> + <customCommand> + <name>REBALANCEHDFS</name> + <background>true</background> + <commandScript> + <script>scripts/namenode.py</script> + <scriptType>PYTHON</scriptType> </commandScript> </customCommand> </customCommands> @@ -47,58 +57,85 @@ <component> <name>DATANODE</name> + <displayName>DataNode</displayName> <category>SLAVE</category> <cardinality>1+</cardinality> <commandScript> <script>scripts/datanode.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>600</timeout> </commandScript> </component> <component> <name>SECONDARY_NAMENODE</name> + <displayName>SNameNode</displayName> <!-- TODO: cardinality is conditional on HA usage --> <cardinality>1</cardinality> <category>MASTER</category> <commandScript> <script>scripts/snamenode.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>600</timeout> </commandScript> </component> <component> <name>HDFS_CLIENT</name> + <displayName>HDFS Client</displayName> <category>CLIENT</category> - <cardinality>0+</cardinality> + <cardinality>1+</cardinality> <commandScript> <script>scripts/hdfs_client.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>600</timeout> </commandScript> + <configFiles> + <configFile> + <type>xml</type> + <fileName>hdfs-site.xml</fileName> + <dictionaryName>hdfs-site</dictionaryName> + </configFile> + <configFile> + <type>xml</type> + <fileName>core-site.xml</fileName> + <dictionaryName>core-site</dictionaryName> + </configFile> + <configFile> + <type>env</type> + <fileName>log4j.properties</fileName> + <dictionaryName>hdfs-log4j,yarn-log4j</dictionaryName> + </configFile> + <configFile> + <type>env</type> + <fileName>hadoop-env.cmds</fileName> + <dictionaryName>hadoop-env</dictionaryName> + </configFile> + </configFiles> </component> <component> <name>JOURNALNODE</name> + <displayName>JournalNode</displayName> <category>SLAVE</category> <cardinality>0+</cardinality> <commandScript> <script>scripts/journalnode.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>600</timeout> </commandScript> </component> <component> <name>ZKFC</name> + <displayName>ZKFailoverController</displayName> <category>SLAVE</category> <!-- TODO: cardinality is conditional on HA topology --> <cardinality>0+</cardinality> <commandScript> <script>scripts/zkfc_slave.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>600</timeout> </commandScript> </component> </components> @@ -106,18 +143,20 @@ <commandScript> <script>scripts/service_check.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>300</timeout> </commandScript> + + <requiredServices> + <service>ZOOKEEPER</service> + </requiredServices> <configuration-dependencies> <config-type>core-site</config-type> - <!--<config-type>global</config-type>--> <config-type>hdfs-site</config-type> <config-type>hadoop-env</config-type> <config-type>hadoop-policy</config-type> - <!--<config-type>hdfs-log4j</config-type>--> + <config-type>hdfs-log4j</config-type> </configuration-dependencies> - </service> </services> </metainfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/588a2cfc/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/metainfo.xml index 5ff494f..0781490 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/OOZIE/metainfo.xml @@ -20,12 +20,14 @@ <services> <service> <name>OOZIE</name> - <comment>System for workflow coordination and execution of Apache Hadoop jobs. This also includes the installation of the optional Oozie Web Console which relies on and will install the <a target="_blank" href="http://www.sencha.com/products/extjs/license/">ExtJS</a> Library. + <displayName>Oozie</displayName> + <comment>System for workflow coordination and execution of Apache Hadoop jobs. This also includes the installation of the optional Oozie Web Console which relies on and will install the <a target="_blank" href="http://www.sencha.com/legal/open-source-faq/">ExtJS</a> Library. </comment> <version>4.0.0.2.0</version> <components> <component> <name>OOZIE_SERVER</name> + <displayName>Oozie Server</displayName> <category>MASTER</category> <cardinality>1</cardinality> <dependencies> @@ -54,14 +56,15 @@ <commandScript> <script>scripts/oozie_server.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>600</timeout> </commandScript> </component> <component> <name>OOZIE_CLIENT</name> + <displayName>Oozie Client</displayName> <category>CLIENT</category> - <cardinality>0+</cardinality> + <cardinality>1+</cardinality> <dependencies> <dependency> <name>HDFS/HDFS_CLIENT</name> @@ -82,21 +85,42 @@ <script>scripts/oozie_client.py</script> <scriptType>PYTHON</scriptType> </commandScript> + <configFiles> + <configFile> + <type>xml</type> + <fileName>oozie-site.xml</fileName> + <dictionaryName>oozie-site</dictionaryName> + </configFile> + <configFile> + <type>env</type> + <fileName>oozie-env.cmd</fileName> + <dictionaryName>oozie-env</dictionaryName> + </configFile> + <configFile> + <type>env</type> + <fileName>oozie-log4j.properties</fileName> + <dictionaryName>oozie-log4j</dictionaryName> + </configFile> + </configFiles> </component> </components> <commandScript> <script>scripts/service_check.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>300</timeout> </commandScript> + + <requiredServices> + <service>YARN</service> + </requiredServices> <configuration-dependencies> <config-type>oozie-site</config-type> <config-type>oozie-env</config-type> <config-type>oozie-log4j</config-type> + <config-type>yarn-site</config-type> </configuration-dependencies> - </service> </services> </metainfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/588a2cfc/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/PIG/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/PIG/metainfo.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/PIG/metainfo.xml index 9ebe438..1a7b683 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/PIG/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/PIG/metainfo.xml @@ -20,30 +20,56 @@ <services> <service> <name>PIG</name> + <displayName>Pig</displayName> <comment>Scripting platform for analyzing large datasets</comment> <version>0.12.0.2.0</version> <components> <component> <name>PIG</name> + <displayName>Pig</displayName> <category>CLIENT</category> <cardinality>0+</cardinality> <commandScript> <script>scripts/pig_client.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>600</timeout> </commandScript> + <configFiles> + <configFile> + <type>env</type> + <fileName>pig-env.cmd</fileName> + <dictionaryName>pig-env</dictionaryName> + </configFile> + <configFile> + <type>env</type> + <fileName>log4j.properties</fileName> + <dictionaryName>pig-log4j</dictionaryName> + </configFile> + <configFile> + <type>env</type> + <fileName>pig.properties</fileName> + <dictionaryName>pig-properties</dictionaryName> + </configFile> + </configFiles> </component> </components> <commandScript> <script>scripts/service_check.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>300</timeout> </commandScript> + + <requiredServices> + <service>YARN</service> + </requiredServices> + <configuration-dependencies> + <config-type>pig-env</config-type> <config-type>pig-log4j</config-type> <config-type>pig-properties</config-type> </configuration-dependencies> + </service> </services> </metainfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/588a2cfc/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/SQOOP/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/SQOOP/metainfo.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/SQOOP/metainfo.xml index 48b1593..443b149 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/SQOOP/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/SQOOP/metainfo.xml @@ -20,6 +20,7 @@ <services> <service> <name>SQOOP</name> + <displayName>Sqoop</displayName> <comment>Tool for transferring bulk data between Apache Hadoop and structured data stores such as relational databases </comment> @@ -28,8 +29,9 @@ <components> <component> <name>SQOOP</name> + <displayName>Sqoop</displayName> <category>CLIENT</category> - <cardinality>0+</cardinality> + <cardinality>1+</cardinality> <dependencies> <dependency> <name>HDFS/HDFS_CLIENT</name> @@ -50,15 +52,28 @@ <script>scripts/sqoop_client.py</script> <scriptType>PYTHON</scriptType> </commandScript> + <configFiles> + <configFile> + <type>env</type> + <fileName>sqoop-env.cmd</fileName> + <dictionaryName>sqoop-env</dictionaryName> + </configFile> + </configFiles> </component> </components> + <commandScript> <script>scripts/service_check.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>300</timeout> </commandScript> + + <requiredServices> + <service>HDFS</service> + </requiredServices> + <configuration-dependencies> - <config-type>sqoop-site</config-type> + <config-type>sqoop-env</config-type> </configuration-dependencies> </service> </services> http://git-wip-us.apache.org/repos/asf/ambari/blob/588a2cfc/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/metainfo.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/metainfo.xml index e327f5c..c3e623e 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/STORM/metainfo.xml @@ -21,12 +21,14 @@ <services> <service> <name>STORM</name> + <displayName>Storm</displayName> <comment>Apache Hadoop Stream processing framework</comment> <version>0.9.1.2.1</version> <components> <component> <name>NIMBUS</name> + <displayName>Nimbus</displayName> <category>MASTER</category> <cardinality>1</cardinality> <dependencies> @@ -41,42 +43,72 @@ <commandScript> <script>scripts/nimbus.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>600</timeout> + </commandScript> + </component> + + <component> + <name>STORM_REST_API</name> + <displayName>Storm REST API Server</displayName> + <category>MASTER</category> + <cardinality>1</cardinality> + <commandScript> + <script>scripts/rest_api.py</script> + <scriptType>PYTHON</scriptType> + <timeout>600</timeout> </commandScript> </component> <component> <name>SUPERVISOR</name> + <displayName>Supervisor</displayName> <category>SLAVE</category> <cardinality>1+</cardinality> <commandScript> <script>scripts/supervisor.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>600</timeout> </commandScript> </component> <component> <name>STORM_UI_SERVER</name> + <displayName>Storm UI Server</displayName> <category>MASTER</category> <cardinality>1</cardinality> <commandScript> <script>scripts/ui_server.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>600</timeout> </commandScript> </component> + <component> + <name>DRPC_SERVER</name> + <displayName>DRPC Server</displayName> + <category>MASTER</category> + <cardinality>1</cardinality> + <commandScript> + <script>scripts/drpc_server.py</script> + <scriptType>PYTHON</scriptType> + <timeout>600</timeout> + </commandScript> + </component> </components> - <commandScript> <script>scripts/service_check.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>300</timeout> </commandScript> + + <requiredServices> + <service>ZOOKEEPER</service> + </requiredServices> + <configuration-dependencies> <config-type>storm-site</config-type> + <config-type>storm-env</config-type> </configuration-dependencies> </service> </services> http://git-wip-us.apache.org/repos/asf/ambari/blob/588a2cfc/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/metainfo.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/metainfo.xml index 899e5ae..1ca4d56 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/TEZ/metainfo.xml @@ -20,23 +20,44 @@ <services> <service> <name>TEZ</name> + <displayName>Tez</displayName> <comment>Tez is the next generation Hadoop Query Processing framework written on top of YARN.</comment> <version>0.4.0.2.1</version> <components> <component> <name>TEZ_CLIENT</name> - <cardinality>0+</cardinality> + <displayName>Tez Client</displayName> + <cardinality>1+</cardinality> <category>CLIENT</category> <commandScript> <script>scripts/tez_client.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>600</timeout> </commandScript> + <configFiles> + <configFile> + <type>xml</type> + <fileName>tez-site.xml</fileName> + <dictionaryName>tez-site</dictionaryName> + </configFile> + <configFile> + <type>env</type> + <fileName>tez-env.cmd</fileName> + <dictionaryName>tez-env</dictionaryName> + </configFile> + </configFiles> </component> </components> + + <requiredServices> + <service>YARN</service> + </requiredServices> + <configuration-dependencies> <config-type>tez-site</config-type> + <config-type>tez-env</config-type> </configuration-dependencies> + </service> </services> </metainfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/588a2cfc/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/metainfo.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/metainfo.xml index 0a15c7e..31eb346 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/YARN/metainfo.xml @@ -21,18 +21,20 @@ <services> <service> <name>YARN</name> + <displayName>YARN</displayName> <comment>Apache Hadoop NextGen MapReduce (YARN)</comment> <version>2.1.0.2.0</version> - <components> + <component> <name>RESOURCEMANAGER</name> + <displayName>ResourceManager</displayName> <category>MASTER</category> <cardinality>1</cardinality> <commandScript> <script>scripts/resourcemanager.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>600</timeout> </commandScript> <customCommands> <customCommand> @@ -40,7 +42,7 @@ <commandScript> <script>scripts/resourcemanager.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>600</timeout> </commandScript> </customCommand> <customCommand> @@ -48,80 +50,95 @@ <commandScript> <script>scripts/resourcemanager.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>600</timeout> </commandScript> </customCommand> </customCommands> + <configuration-dependencies> + <config-type>capacity-scheduler</config-type> + </configuration-dependencies> </component> <component> <name>NODEMANAGER</name> + <displayName>NodeManager</displayName> <category>SLAVE</category> <cardinality>1+</cardinality> <commandScript> <script>scripts/nodemanager.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>600</timeout> </commandScript> </component> - <!--<component>--> - <!--<name>APP_TIMELINE_SERVER</name>--> - <!--<category>SLAVE</category>--> - <!--<cardinality>1</cardinality>--> - <!--<commandScript>--> - <!--<script>scripts/application_timeline_server.py</script>--> - <!--<scriptType>PYTHON</scriptType>--> - <!--<timeout>1200</timeout>--> - <!--</commandScript>--> - <!--</component>--> - <component> <name>YARN_CLIENT</name> + <displayName>Yarn Client</displayName> <category>CLIENT</category> - <cardinality>0+</cardinality> + <cardinality>1+</cardinality> <commandScript> <script>scripts/yarn_client.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>600</timeout> </commandScript> + <configFiles> + <configFile> + <type>xml</type> + <fileName>yarn-site.xml</fileName> + <dictionaryName>yarn-site</dictionaryName> + </configFile> + <configFile> + <type>xml</type> + <fileName>core-site.xml</fileName> + <dictionaryName>core-site</dictionaryName> + </configFile> + <configFile> + <type>env</type> + <fileName>yarn-env.cmd</fileName> + <dictionaryName>yarn-env</dictionaryName> + </configFile> + <configFile> + <type>env</type> + <fileName>log4j.properties</fileName> + <dictionaryName>hdfs-log4j,yarn-log4j</dictionaryName> + </configFile> + <configFile> + <type>xml</type> + <fileName>capacity-scheduler.xml</fileName> + <dictionaryName>capacity-scheduler</dictionaryName> + </configFile> + </configFiles> </component> </components> - <osSpecifics> - <osSpecific> - <osFamily>any</osFamily> - <packages> - <package> - <name>hadoop-yarn</name> - </package> - <package> - <name>hadoop-mapreduce</name> - </package> - </packages> - </osSpecific> - </osSpecifics> - <commandScript> <script>scripts/service_check.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>300</timeout> </commandScript> + + <requiredServices> + <service>HDFS</service> + </requiredServices> <configuration-dependencies> <config-type>yarn-site</config-type> - <config-type>capacity-scheduler</config-type> + <config-type>yarn-env</config-type> + <config-type>core-site</config-type> + <config-type>mapred-site</config-type> + <config-type>yarn-log4j</config-type> </configuration-dependencies> </service> - <service> <name>MAPREDUCE2</name> + <displayName>MapReduce2</displayName> <comment>Apache Hadoop NextGen MapReduce (YARN)</comment> <version>2.1.0.2.0.6.0</version> <components> <component> <name>HISTORYSERVER</name> + <displayName>History Server</displayName> <category>MASTER</category> <cardinality>1</cardinality> <auto-deploy> @@ -140,19 +157,37 @@ <commandScript> <script>scripts/historyserver.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>600</timeout> </commandScript> </component> <component> <name>MAPREDUCE2_CLIENT</name> + <displayName>MapReduce2 Client</displayName> <category>CLIENT</category> <cardinality>0+</cardinality> <commandScript> <script>scripts/mapreduce2_client.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>600</timeout> </commandScript> + <configFiles> + <configFile> + <type>xml</type> + <fileName>mapred-site.xml</fileName> + <dictionaryName>mapred-site</dictionaryName> + </configFile> + <configFile> + <type>xml</type> + <fileName>core-site.xml</fileName> + <dictionaryName>core-site</dictionaryName> + </configFile> + <configFile> + <type>env</type> + <fileName>mapred-env.cmd</fileName> + <dictionaryName>mapred-env</dictionaryName> + </configFile> + </configFiles> </component> </components> @@ -170,15 +205,20 @@ <commandScript> <script>scripts/mapred_service_check.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>300</timeout> </commandScript> + + <requiredServices> + <service>YARN</service> + </requiredServices> <configuration-dir>configuration-mapred</configuration-dir> <configuration-dependencies> + <config-type>core-site</config-type> <config-type>mapred-site</config-type> + <config-type>mapred-env</config-type> </configuration-dependencies> - </service> </services> http://git-wip-us.apache.org/repos/asf/ambari/blob/588a2cfc/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/metainfo.xml index a97e4e7..4ac1c7e 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/ZOOKEEPER/metainfo.xml @@ -20,42 +20,59 @@ <services> <service> <name>ZOOKEEPER</name> + <displayName>ZooKeeper</displayName> <comment>Centralized service which provides highly reliable distributed coordination</comment> <version>3.4.5.2.0</version> <components> <component> <name>ZOOKEEPER_SERVER</name> + <displayName>ZooKeeper Server</displayName> <category>MASTER</category> <cardinality>1+</cardinality> <commandScript> <script>scripts/zookeeper_server.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>600</timeout> </commandScript> </component> <component> <name>ZOOKEEPER_CLIENT</name> + <displayName>ZooKeeper Client</displayName> <category>CLIENT</category> - <cardinality>0+</cardinality> + <cardinality>1+</cardinality> <commandScript> <script>scripts/zookeeper_client.py</script> <scriptType>PYTHON</scriptType> </commandScript> + <configFiles> + <configFile> + <type>env</type> + <fileName>zookeeper-env.cmd</fileName> + <dictionaryName>zookeeper-env</dictionaryName> + </configFile> + <configFile> + <type>env</type> + <fileName>log4j.properties</fileName> + <dictionaryName>zookeeper-log4j</dictionaryName> + </configFile> + </configFiles> </component> </components> - <commandScript> <script>scripts/service_check.py</script> <scriptType>PYTHON</scriptType> - <timeout>1200</timeout> + <timeout>300</timeout> </commandScript> + <configuration-dependencies> + <config-type>zookeeper-log4j</config-type> <config-type>zookeeper-env</config-type> + <config-type>zoo.cfg</config-type> </configuration-dependencies> - + <restartRequiredAfterChange>true</restartRequiredAfterChange> </service> </services> </metainfo>
