You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2014/06/23 19:30:33 UTC
[1/4] AMBARI-6239. Remove legacy metainfo.xml V1 support
(ServiceMetainfoXml.java) (dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/trunk fd8754d25 -> 02a46f7d1
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/YARN/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/YARN/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/YARN/metainfo.xml
index b196c83..d52e8c3 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/YARN/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/YARN/metainfo.xml
@@ -16,25 +16,95 @@
limitations under the License.
-->
<metainfo>
- <user>mapred</user>
- <comment>Apache Hadoop NextGen MapReduce (YARN)</comment>
- <version>2.1.0.2.0.5.0</version>
- <components>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>YARN</name>
+ <comment>Apache Hadoop NextGen MapReduce (YARN)</comment>
+ <version>2.1.0.2.0.5.0</version>
+ <components>
+
<component>
- <name>RESOURCEMANAGER</name>
- <category>MASTER</category>
+ <name>RESOURCEMANAGER</name>
+ <category>MASTER</category>
+ <cardinality>1</cardinality>
+ <commandScript>
+ <script>scripts/resourcemanager.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
+ <customCommands>
+ <customCommand>
+ <name>DECOMMISSION</name>
+ <commandScript>
+ <script>scripts/resourcemanager.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
+ </customCommand>
+ <customCommand>
+ <name>REFRESHQUEUES</name>
+ <commandScript>
+ <script>scripts/resourcemanager.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
+ </customCommand>
+ </customCommands>
</component>
+
<component>
- <name>NODEMANAGER</name>
- <category>SLAVE</category>
+ <name>NODEMANAGER</name>
+ <category>SLAVE</category>
+ <cardinality>1+</cardinality>
+ <commandScript>
+ <script>scripts/nodemanager.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
- <component>
- <name>YARN_CLIENT</name>
- <category>CLIENT</category>
+
+ <component>
+ <name>YARN_CLIENT</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/yarn_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
- </components>
- <configuration-dependencies>
- <config-type>yarn-site</config-type>
- <config-type>global</config-type>
- </configuration-dependencies>
+ </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>300</timeout>
+ </commandScript>
+
+ <configuration-dependencies>
+ <config-type>yarn-site</config-type>
+ <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>
+ <config-type>yarn-log4j</config-type>
+ </configuration-dependencies>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/ZOOKEEPER/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/ZOOKEEPER/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/ZOOKEEPER/metainfo.xml
index 41d907e..2875b77 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/ZOOKEEPER/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/ZOOKEEPER/metainfo.xml
@@ -16,20 +16,60 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Centralized service which provides highly reliable distributed coordination</comment>
- <version>3.4.5.2.0.5.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>ZOOKEEPER</name>
+ <comment>Centralized service which provides highly reliable distributed coordination</comment>
+ <version>3.4.5.2.0.5.0</version>
+
+ <components>
- <components>
<component>
- <name>ZOOKEEPER_SERVER</name>
- <category>MASTER</category>
+ <name>ZOOKEEPER_SERVER</name>
+ <category>MASTER</category>
+ <cardinality>1+</cardinality>
+ <commandScript>
+ <script>scripts/zookeeper_server.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
<component>
- <name>ZOOKEEPER_CLIENT</name>
- <category>CLIENT</category>
+ <name>ZOOKEEPER_CLIENT</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/zookeeper_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
- </components>
+ </components>
+
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>zookeeper</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>zookeeper-log4j</config-type>
+ <config-type>zoo.cfg</config-type>
+ </configuration-dependencies>
+ <restartRequiredAfterChange>true</restartRequiredAfterChange>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/SQOOP/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/SQOOP/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/SQOOP/metainfo.xml
index 50ff0ed..fc083d6 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/SQOOP/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/SQOOP/metainfo.xml
@@ -16,15 +16,19 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Tool for transferring bulk data between Apache Hadoop and structured data stores such as relational databases</comment>
- <version></version>
- <deleted>true</deleted>
- <components>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>SQOOP</name>
+ <comment>Tool for transferring bulk data between Apache Hadoop and structured data stores such as relational databases</comment>
+ <version></version>
+ <deleted>true</deleted>
+ <components>
<component>
- <name>SQOOP</name>
- <category>CLIENT</category>
+ <name>SQOOP</name>
+ <category>CLIENT</category>
</component>
- </components>
-
+ </components>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/YARN/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/YARN/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/YARN/metainfo.xml
index 6f02f79..f4d35b9 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/YARN/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/YARN/metainfo.xml
@@ -15,31 +15,103 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<metainfo>
- <user>mapred</user>
- <comment>Apache Hadoop NextGen MapReduce (YARN)</comment>
- <version>2.1.0.2.0.6.0</version>
- <deleted>false</deleted>
- <components>
- <component>
- <name>RESOURCEMANAGER</name>
- <category>MASTER</category>
- </component>
- <component>
- <name>NODEMANAGER</name>
- <category>SLAVE</category>
- </component>
- <component>
- <name>YARN_CLIENT</name>
- <category>CLIENT</category>
- <deleted>true</deleted>
- </component>
- <component>
- <name>TEZ</name>
- <category>CLIENT</category>
- </component>
- </components>
- <configuration-dependencies>
- <config-type>core-site</config-type>
- </configuration-dependencies>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>YARN</name>
+ <comment>Apache Hadoop NextGen MapReduce (YARN)</comment>
+ <version>2.1.0.2.0.6.0</version>
+ <components>
+
+ <component>
+ <name>RESOURCEMANAGER</name>
+ <category>MASTER</category>
+ <cardinality>1</cardinality>
+ <commandScript>
+ <script>scripts/resourcemanager.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
+ <customCommands>
+ <customCommand>
+ <name>DECOMMISSION</name>
+ <commandScript>
+ <script>scripts/resourcemanager.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
+ </customCommand>
+ <customCommand>
+ <name>REFRESHQUEUES</name>
+ <commandScript>
+ <script>scripts/resourcemanager.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
+ </customCommand>
+ </customCommands>
+ </component>
+
+ <component>
+ <name>NODEMANAGER</name>
+ <category>SLAVE</category>
+ <cardinality>1+</cardinality>
+ <commandScript>
+ <script>scripts/nodemanager.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
+ </component>
+
+ <component>
+ <name>YARN_CLIENT</name>
+ <category>CLIENT</category>
+ <deleted>true</deleted>
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/yarn_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
+ </component>
+ <component>
+ <name>TEZ</name>
+ <category>CLIENT</category>
+ </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>300</timeout>
+ </commandScript>
+
+ <configuration-dependencies>
+ <config-type>yarn-site</config-type>
+ <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>
+ <config-type>yarn-log4j</config-type>
+ </configuration-dependencies>
+ </service>
+
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HIVE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HIVE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HIVE/metainfo.xml
index 15b95fa..685f46e 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HIVE/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HIVE/metainfo.xml
@@ -16,32 +16,141 @@
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.2.0.5.0</version>
-
- <components>
- <component>
- <name>HIVE_METASTORE</name>
- <category>MASTER</category>
- </component>
- <component>
- <name>HIVE_SERVER</name>
- <category>MASTER</category>
- </component>
- <component>
- <name>MYSQL_SERVER</name>
- <category>MASTER</category>
- </component>
- <component>
- <name>HIVE_CLIENT</name>
- <category>CLIENT</category>
- </component>
- </components>
- <configuration-dependencies>
- <config-type>global</config-type>
- <config-type>hive-site</config-type>
- </configuration-dependencies>
+ <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.2.0.5.0</version>
+
+ <components>
+
+ <component>
+ <name>HIVE_METASTORE</name>
+ <category>MASTER</category>
+ <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>
+ <dependency>
+ <name>TEZ/TEZ_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ <dependency>
+ <name>YARN/YARN_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ <dependency>
+ <name>MAPREDUCE2/MAPREDUCE2_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ </dependencies>
+ <commandScript>
+ <script>scripts/hive_server.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
+ </component>
+
+ <component>
+ <name>MYSQL_SERVER</name>
+ <category>MASTER</category>
+ <cardinality>1</cardinality>
+ <commandScript>
+ <script>scripts/mysql_server.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
+ </component>
+
+ <component>
+ <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>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>hive</name>
+ </package>
+ <package>
+ <name>mysql-connector-java</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>redhat5,redhat6,suse11</osFamily>
+ <packages>
+ <package>
+ <name>mysql</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>redhat5,redhat6,debian12</osFamily>
+ <packages>
+ <package>
+ <name>mysql-server</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>suse11</osFamily>
+ <packages>
+ <package>
+ <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>global</config-type>
+ <config-type>hive-site</config-type>
+ </configuration-dependencies>
+ </service>
+ </services>
</metainfo>
[3/4] AMBARI-6239. Remove legacy metainfo.xml V1 support
(ServiceMetainfoXml.java) (dlysnichenko)
Posted by dm...@apache.org.
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/WEBHCAT/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/WEBHCAT/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/WEBHCAT/metainfo.xml
index e65992f..5ec4f05 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/WEBHCAT/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/WEBHCAT/metainfo.xml
@@ -16,16 +16,80 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>This is comment for WEBHCAT service</comment>
- <version>0.5.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>WEBHCAT</name>
+ <comment>This is comment for WEBHCAT service</comment>
+ <version>0.5.0</version>
- <components>
+ <components>
<component>
- <name>WEBHCAT_SERVER</name>
- <category>MASTER</category>
+ <name>WEBHCAT_SERVER</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>MAPREDUCE/MAPREDUCE_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>WEBHCAT/WEBHCAT_SERVER</co-locate>
+ </auto-deploy>
+ </dependency>
+ <dependency>
+ <name>ZOOKEEPER/ZOOKEEPER_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ </dependencies>
+ <commandScript>
+ <script>scripts/webhcat_server.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
- </components>
-
-
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>hcatalog</name>
+ </package>
+ <package>
+ <name>webhcat-tar-hive</name>
+ </package>
+ <package>
+ <name>webhcat-tar-pig</name>
+ </package>
+ </packages>
+ </osSpecific>
+ </osSpecifics>
+ <commandScript>
+ <script>scripts/service_check.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>300</timeout>
+ </commandScript>
+ <configuration-dependencies>
+ <config-type>webhcat-site</config-type>
+ </configuration-dependencies>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/ZOOKEEPER/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/ZOOKEEPER/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/ZOOKEEPER/metainfo.xml
index fc0c3b5..946ef54 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/ZOOKEEPER/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/ZOOKEEPER/metainfo.xml
@@ -16,20 +16,57 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Centralized service which provides highly reliable distributed coordination</comment>
- <version>3.4.5</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>ZOOKEEPER</name>
+ <comment>Centralized service which provides highly reliable distributed coordination</comment>
+ <version>3.4.5</version>
+
+ <components>
- <components>
<component>
- <name>ZOOKEEPER_SERVER</name>
- <category>MASTER</category>
+ <name>ZOOKEEPER_SERVER</name>
+ <category>MASTER</category>
+ <cardinality>1</cardinality>
+ <commandScript>
+ <script>scripts/zookeeper_server.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
<component>
- <name>ZOOKEEPER_CLIENT</name>
- <category>CLIENT</category>
+ <name>ZOOKEEPER_CLIENT</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/zookeeper_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
- </components>
+ </components>
+
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>zookeeper</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/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/GANGLIA/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/GANGLIA/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/GANGLIA/metainfo.xml
index 0b21f0f..ca15c7b 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/GANGLIA/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/GANGLIA/metainfo.xml
@@ -16,25 +16,82 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Ganglia Metrics Collection system</comment>
- <version>3.2.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>GANGLIA</name>
+ <comment>Ganglia Metrics Collection system</comment>
+ <version>3.2.0</version>
- <components>
+ <components>
<component>
- <name>GANGLIA_SERVER</name>
- <category>MASTER</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>GANGLIA_MONITOR</name>
- <category>SLAVE</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>
-
- <component>
- <name>MONITOR_WEBSERVER</name>
- <category>MASTER</category>
- </component>
- </components>
-
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>libganglia-3.5.0-99</name>
+ </package>
+ <package>
+ <name>ganglia-devel-3.5.0-99</name>
+ </package>
+ <package>
+ <name>ganglia-gmetad-3.5.0-99</name>
+ </package>
+ <package>
+ <name>ganglia-web-3.5.7-99.noarch</name>
+ </package>
+ <package>
+ <name>python-rrdtool.x86_64</name>
+ </package>
+ <package>
+ <name>ganglia-gmond-3.5.0-99</name>
+ </package>
+ <package>
+ <name>ganglia-gmond-modules-python-3.5.0-99</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>suse</osFamily>
+ <package>
+ <name>apache2</name>
+ </package>
+ <package>
+ <name>apache2-mod_php5</name>
+ </package>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>centos6</osFamily>
+ <package>
+ <name>httpd</name>
+ </package>
+ </osSpecific>
+ </osSpecifics>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HBASE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HBASE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HBASE/metainfo.xml
index 1bb3d14..6c882d1 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HBASE/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HBASE/metainfo.xml
@@ -16,25 +16,105 @@
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.0.0</version>
+ <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.0.0</version>
- <components>
+ <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>
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>centos6</osFamily>
+ <packages>
+ <package>
+ <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/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HCATALOG/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HCATALOG/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HCATALOG/metainfo.xml
index dd5ff08..7f9683a 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HCATALOG/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HCATALOG/metainfo.xml
@@ -16,15 +16,42 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>This is comment for HCATALOG service</comment>
- <version>0.6.0.1.3.0.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>HCATALOG</name>
+ <comment>This is comment for HCATALOG service</comment>
+ <version>0.6.0.1.3.0.0</version>
- <components>
+ <components>
<component>
- <name>HCAT</name>
- <category>CLIENT</category>
+ <name>HCAT</name>
+ <category>CLIENT</category>
+ <commandScript>
+ <script>scripts/hcat_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
- </components>
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <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/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HDFS/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HDFS/metainfo.xml
index c29bb61..ce48c37 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HDFS/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HDFS/metainfo.xml
@@ -16,31 +16,121 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Apache Hadoop Distributed File System</comment>
- <version>1.2.0.1.3.0.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>HDFS</name>
+ <comment>Apache Hadoop Distributed File System</comment>
+ <version>1.2.0.1.3.0.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>
-
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>lzo</name>
+ </package>
+ <package>
+ <name>hadoop</name>
+ </package>
+ <package>
+ <name>hadoop-libhdfs</name>
+ </package>
+ <package>
+ <name>hadoop-native</name>
+ </package>
+ <package>
+ <name>hadoop-pipes</name>
+ </package>
+ <package>
+ <name>hadoop-sbin</name>
+ </package>
+ <package>
+ <name>hadoop-lzo</name>
+ </package>
+ <package>
+ <name>hadoop-lzo-native</name>
+ </package>
+ <package>
+ <name>snappy</name>
+ </package>
+ <package>
+ <name>snappy-devel</name>
+ </package>
+ <package>
+ <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>
+ <config-type>hdfs-log4j</config-type>
+ </configuration-dependencies>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HIVE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HIVE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HIVE/metainfo.xml
index 520ccec..aac2e50 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HIVE/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HIVE/metainfo.xml
@@ -16,28 +16,128 @@
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.0.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.0.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>
+ <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>MYSQL_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>HIVE_CLIENT</name>
- <category>CLIENT</category>
+ <name>HIVE_CLIENT</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/hive_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
- </components>
+ </components>
+
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>hive</name>
+ </package>
+ <package>
+ <name>mysql-connector-java</name>
+ </package>
+ <package>
+ <name>mysql</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>centos6</osFamily>
+ <packages>
+ <package>
+ <name>mysql-server</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>centos5</osFamily>
+ <packages>
+ <package>
+ <name>mysql-server</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>suse</osFamily>
+ <packages>
+ <package>
+ <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>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HUE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HUE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HUE/metainfo.xml
index c6e384f..fdfe58f 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HUE/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HUE/metainfo.xml
@@ -16,16 +16,20 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Hue is a graphical user interface to operate and develop
- applications for Apache Hadoop.</comment>
- <version>2.2.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>HUE</name>
+ <comment>Hue is a graphical user interface to operate and develop
+ applications for Apache Hadoop.</comment>
+ <version>2.2.0</version>
- <components>
+ <components>
<component>
- <name>HUE_SERVER</name>
- <category>MASTER</category>
+ <name>HUE_SERVER</name>
+ <category>MASTER</category>
</component>
- </components>
-
+ </components>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/MAPREDUCE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/MAPREDUCE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/MAPREDUCE/metainfo.xml
index b4a95a0..a423e1e 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/MAPREDUCE/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/MAPREDUCE/metainfo.xml
@@ -16,26 +16,71 @@
limitations under the License.
-->
<metainfo>
- <user>mapred</user>
- <comment>Apache Hadoop Distributed Processing Framework</comment>
- <version>1.2.0.1.3.0.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>MAPREDUCE</name>
+ <comment>Apache Hadoop Distributed Processing Framework</comment>
+ <version>1.2.0.1.3.0.0</version>
- <components>
+ <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>
- </components>
+ </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>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/NAGIOS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/NAGIOS/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/NAGIOS/metainfo.xml
index bd7de07..4b9872f 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/NAGIOS/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/NAGIOS/metainfo.xml
@@ -16,15 +16,80 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Nagios Monitoring and Alerting system</comment>
- <version>3.2.3</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>NAGIOS</name>
+ <comment>Nagios Monitoring and Alerting system</comment>
+ <version>3.2.3</version>
- <components>
+ <components>
<component>
- <name>NAGIOS_SERVER</name>
- <category>MASTER</category>
+ <name>NAGIOS_SERVER</name>
+ <category>MASTER</category>
+ <cardinality>1</cardinality>
+ <commandScript>
+ <script>scripts/nagios_server.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
- </components>
-
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>perl</name>
+ </package>
+ <package>
+ <name>perl-Net-SNMP</name>
+ </package>
+ <package>
+ <name>nagios-plugins-1.4.9</name>
+ </package>
+ <package>
+ <name>nagios-3.5.0-99</name>
+ </package>
+ <package>
+ <name>nagios-www-3.5.0-99</name>
+ </package>
+ <package>
+ <name>nagios-devel-3.5.0-99</name>
+ </package>
+ <package>
+ <name>fping</name>
+ </package>
+ <package>
+ <name>hdp_mon_nagios_addons</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>suse</osFamily>
+ <package>
+ <name>php5-json</name>
+ </package>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>centos5</osFamily>
+ <package>
+ <name>php-pecl-json.x86_64</name>
+ </package>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>redhat5</osFamily>
+ <package>
+ <name>php-pecl-json.x86_64</name>
+ </package>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>oraclelinux5</osFamily>
+ <package>
+ <name>php-pecl-json.x86_64</name>
+ </package>
+ </osSpecific>
+ </osSpecifics>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/OOZIE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/OOZIE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/OOZIE/metainfo.xml
index 46460b4..9bdd1b1 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/OOZIE/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/OOZIE/metainfo.xml
@@ -16,20 +16,95 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>System for workflow coordination and execution of Apache Hadoop jobs</comment>
- <version>3.3.2.1.3.0.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>OOZIE</name>
+ <comment>System for workflow coordination and execution of Apache Hadoop jobs</comment>
+ <version>3.3.2.1.3.0.0</version>
- <components>
+ <components>
<component>
- <name>OOZIE_SERVER</name>
- <category>MASTER</category>
+ <name>OOZIE_SERVER</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>MAPREDUCE/MAPREDUCE_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ </dependencies>
+ <commandScript>
+ <script>scripts/oozie_server.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
<component>
- <name>OOZIE_CLIENT</name>
- <category>CLIENT</category>
+ <name>OOZIE_CLIENT</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <dependencies>
+ <dependency>
+ <name>HDFS/HDFS_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ <dependency>
+ <name>MAPREDUCE/MAPREDUCE_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ </dependencies>
+ <commandScript>
+ <script>scripts/oozie_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
- </components>
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>oozie.noarch</name>
+ </package>
+ <package>
+ <name>oozie-client.noarch</name>
+ </package>
+ <package>
+ <name>extjs-2.2-1</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>oozie-site</config-type>
+ </configuration-dependencies>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/PIG/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/PIG/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/PIG/metainfo.xml
index 6806c54..3037bd7 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/PIG/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/PIG/metainfo.xml
@@ -16,15 +16,45 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Scripting platform for analyzing large datasets</comment>
- <version>0.11.1.1.3.0.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>PIG</name>
+ <comment>Scripting platform for analyzing large datasets</comment>
+ <version>0.11.1.1.3.0.0</version>
- <components>
+ <components>
<component>
- <name>PIG</name>
- <category>CLIENT</category>
+ <name>PIG</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/pig_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
- </components>
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>centos6</osFamily>
+ <packages>
+ <package>
+ <name>pig</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/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/SQOOP/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/SQOOP/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/SQOOP/metainfo.xml
index 1924c54..5bafc9b 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/SQOOP/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/SQOOP/metainfo.xml
@@ -16,15 +16,58 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Tool for transferring bulk data between Apache Hadoop and structured data stores such as relational databases</comment>
- <version>1.4.3.1.3.0.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>SQOOP</name>
+ <comment>Tool for transferring bulk data between Apache Hadoop and structured data stores such as relational databases</comment>
+ <version>1.4.3.1.3.0.0</version>
- <components>
+ <components>
<component>
- <name>SQOOP</name>
- <category>CLIENT</category>
+ <name>SQOOP</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <dependencies>
+ <dependency>
+ <name>HDFS/HDFS_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ <dependency>
+ <name>MAPREDUCE/MAPREDUCE_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ </dependencies>
+ <commandScript>
+ <script>scripts/sqoop_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
- </components>
-
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>sqoop</name>
+ </package>
+ <package>
+ <name>mysql-connector-java</name>
+ </package>
+ </packages>
+ </osSpecific>
+ </osSpecifics>
+ <commandScript>
+ <script>scripts/service_check.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>300</timeout>
+ </commandScript>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/WEBHCAT/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/WEBHCAT/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/WEBHCAT/metainfo.xml
index 15c8daa..f8f42f9 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/WEBHCAT/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/WEBHCAT/metainfo.xml
@@ -16,16 +16,19 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>This is comment for WEBHCAT service</comment>
- <version>0.11.0.1.3.0.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>WEBHCAT</name>
+ <comment>This is comment for WEBHCAT service</comment>
+ <version>0.11.0.1.3.0.0</version>
- <components>
+ <components>
<component>
- <name>WEBHCAT_SERVER</name>
- <category>MASTER</category>
+ <name>WEBHCAT_SERVER</name>
+ <category>MASTER</category>
</component>
- </components>
-
-
+ </components>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/ZOOKEEPER/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/ZOOKEEPER/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/ZOOKEEPER/metainfo.xml
index 3dc129b..4182a79 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/ZOOKEEPER/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/ZOOKEEPER/metainfo.xml
@@ -16,20 +16,56 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Centralized service which provides highly reliable distributed coordination</comment>
- <version>3.4.5.1.3.0.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>ZOOKEEPER</name>
+ <comment>Centralized service which provides highly reliable distributed coordination</comment>
+ <version>3.4.5.1.3.3.0</version>
+ <components>
- <components>
<component>
- <name>ZOOKEEPER_SERVER</name>
- <category>MASTER</category>
+ <name>ZOOKEEPER_SERVER</name>
+ <category>MASTER</category>
+ <cardinality>1</cardinality>
+ <commandScript>
+ <script>scripts/zookeeper_server.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
<component>
- <name>ZOOKEEPER_CLIENT</name>
- <category>CLIENT</category>
+ <name>ZOOKEEPER_CLIENT</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/zookeeper_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
- </components>
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>zookeeper</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/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/GANGLIA/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/GANGLIA/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/GANGLIA/metainfo.xml
index 0b21f0f..ca15c7b 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/GANGLIA/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/GANGLIA/metainfo.xml
@@ -16,25 +16,82 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Ganglia Metrics Collection system</comment>
- <version>3.2.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>GANGLIA</name>
+ <comment>Ganglia Metrics Collection system</comment>
+ <version>3.2.0</version>
- <components>
+ <components>
<component>
- <name>GANGLIA_SERVER</name>
- <category>MASTER</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>GANGLIA_MONITOR</name>
- <category>SLAVE</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>
-
- <component>
- <name>MONITOR_WEBSERVER</name>
- <category>MASTER</category>
- </component>
- </components>
-
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>libganglia-3.5.0-99</name>
+ </package>
+ <package>
+ <name>ganglia-devel-3.5.0-99</name>
+ </package>
+ <package>
+ <name>ganglia-gmetad-3.5.0-99</name>
+ </package>
+ <package>
+ <name>ganglia-web-3.5.7-99.noarch</name>
+ </package>
+ <package>
+ <name>python-rrdtool.x86_64</name>
+ </package>
+ <package>
+ <name>ganglia-gmond-3.5.0-99</name>
+ </package>
+ <package>
+ <name>ganglia-gmond-modules-python-3.5.0-99</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>suse</osFamily>
+ <package>
+ <name>apache2</name>
+ </package>
+ <package>
+ <name>apache2-mod_php5</name>
+ </package>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>centos6</osFamily>
+ <package>
+ <name>httpd</name>
+ </package>
+ </osSpecific>
+ </osSpecifics>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HBASE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HBASE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HBASE/metainfo.xml
index 553fa2b..9cbb11e 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HBASE/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HBASE/metainfo.xml
@@ -16,25 +16,106 @@
limitations under the License.
-->
<metainfo>
- <user>mapred</user>
- <comment>Non-relational distributed database and centralized service for configuration management & synchronization</comment>
- <version>0.94.5</version>
+ <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.5</version>
- <components>
+ <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>
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>centos6</osFamily>
+ <packages>
+ <package>
+ <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/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HCATALOG/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HCATALOG/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HCATALOG/metainfo.xml
index 1951a5d..2cf0e49 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HCATALOG/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HCATALOG/metainfo.xml
@@ -16,15 +16,42 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>This is comment for HCATALOG service</comment>
- <version>0.5.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>HCATALOG</name>
+ <comment>This is comment for HCATALOG service</comment>
+ <version>0.5.0</version>
- <components>
+ <components>
<component>
- <name>HCAT</name>
- <category>CLIENT</category>
+ <name>HCAT</name>
+ <category>CLIENT</category>
+ <commandScript>
+ <script>scripts/hcat_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
- </components>
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <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/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HCFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HCFS/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HCFS/metainfo.xml
index 212e53e..ab90316 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HCFS/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HCFS/metainfo.xml
@@ -16,15 +16,18 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Hadoop Compatible File System</comment>
- <version>1.0.0</version>
- <components>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>HCFS</name>
+ <comment>Hadoop Compatible File System</comment>
+ <version>1.0.0</version>
+ <components>
<component>
- <name>GLUSTERFS_CLIENT</name>
- <category>CLIENT</category>
+ <name>GLUSTERFS_CLIENT</name>
+ <category>CLIENT</category>
</component>
- </components>
-
-
+ </components>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HDFS/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HDFS/metainfo.xml
index 1b185e1..57cfb0d 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HDFS/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HDFS/metainfo.xml
@@ -16,31 +16,121 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Apache Hadoop Distributed File System</comment>
- <version>1.1.2</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>HDFS</name>
+ <comment>Apache Hadoop Distributed File System</comment>
+ <version>1.1.2</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>
-
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>lzo</name>
+ </package>
+ <package>
+ <name>hadoop</name>
+ </package>
+ <package>
+ <name>hadoop-libhdfs</name>
+ </package>
+ <package>
+ <name>hadoop-native</name>
+ </package>
+ <package>
+ <name>hadoop-pipes</name>
+ </package>
+ <package>
+ <name>hadoop-sbin</name>
+ </package>
+ <package>
+ <name>hadoop-lzo</name>
+ </package>
+ <package>
+ <name>hadoop-lzo-native</name>
+ </package>
+ <package>
+ <name>snappy</name>
+ </package>
+ <package>
+ <name>snappy-devel</name>
+ </package>
+ <package>
+ <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>
+ <config-type>hdfs-log4j</config-type>
+ </configuration-dependencies>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HIVE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HIVE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HIVE/metainfo.xml
index 6a52064..715853c 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HIVE/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/HIVE/metainfo.xml
@@ -16,28 +16,128 @@
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.10.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.10.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>
+ <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>MYSQL_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>HIVE_CLIENT</name>
- <category>CLIENT</category>
+ <name>HIVE_CLIENT</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/hive_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
- </components>
+ </components>
+
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>hive</name>
+ </package>
+ <package>
+ <name>mysql-connector-java</name>
+ </package>
+ <package>
+ <name>mysql</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>centos6</osFamily>
+ <packages>
+ <package>
+ <name>mysql-server</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>centos5</osFamily>
+ <packages>
+ <package>
+ <name>mysql-server</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>suse</osFamily>
+ <packages>
+ <package>
+ <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>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/MAPREDUCE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/MAPREDUCE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/MAPREDUCE/metainfo.xml
index 79d219b..37adb89 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/MAPREDUCE/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/MAPREDUCE/metainfo.xml
@@ -16,26 +16,71 @@
limitations under the License.
-->
<metainfo>
- <user>mapred</user>
- <comment>Apache Hadoop Distributed Processing Framework</comment>
- <version>1.1.2</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>MAPREDUCE</name>
+ <comment>Apache Hadoop Distributed Processing Framework</comment>
+ <version>1.1.2</version>
- <components>
+ <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>
- </components>
+ </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>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/NAGIOS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/NAGIOS/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/NAGIOS/metainfo.xml
index bd7de07..4b9872f 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/NAGIOS/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/NAGIOS/metainfo.xml
@@ -16,15 +16,80 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Nagios Monitoring and Alerting system</comment>
- <version>3.2.3</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>NAGIOS</name>
+ <comment>Nagios Monitoring and Alerting system</comment>
+ <version>3.2.3</version>
- <components>
+ <components>
<component>
- <name>NAGIOS_SERVER</name>
- <category>MASTER</category>
+ <name>NAGIOS_SERVER</name>
+ <category>MASTER</category>
+ <cardinality>1</cardinality>
+ <commandScript>
+ <script>scripts/nagios_server.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
- </components>
-
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>perl</name>
+ </package>
+ <package>
+ <name>perl-Net-SNMP</name>
+ </package>
+ <package>
+ <name>nagios-plugins-1.4.9</name>
+ </package>
+ <package>
+ <name>nagios-3.5.0-99</name>
+ </package>
+ <package>
+ <name>nagios-www-3.5.0-99</name>
+ </package>
+ <package>
+ <name>nagios-devel-3.5.0-99</name>
+ </package>
+ <package>
+ <name>fping</name>
+ </package>
+ <package>
+ <name>hdp_mon_nagios_addons</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>suse</osFamily>
+ <package>
+ <name>php5-json</name>
+ </package>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>centos5</osFamily>
+ <package>
+ <name>php-pecl-json.x86_64</name>
+ </package>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>redhat5</osFamily>
+ <package>
+ <name>php-pecl-json.x86_64</name>
+ </package>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>oraclelinux5</osFamily>
+ <package>
+ <name>php-pecl-json.x86_64</name>
+ </package>
+ </osSpecific>
+ </osSpecifics>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/NONAME/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/NONAME/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/NONAME/metainfo.xml
index 47e7291..50c6efa 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/NONAME/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/NONAME/metainfo.xml
@@ -16,15 +16,18 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>No-name service</comment>
- <version>1.0.0</version>
- <components>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>NONAME</name>
+ <comment>No-name service</comment>
+ <version>1.0.0</version>
+ <components>
<component>
- <name>NONAME_SERVER</name>
- <category>MASTER</category>
+ <name>NONAME_SERVER</name>
+ <category>MASTER</category>
</component>
- </components>
-
-
+ </components>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/OOZIE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/OOZIE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/OOZIE/metainfo.xml
index 83ccb06..cc33a0f 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/OOZIE/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/OOZIE/metainfo.xml
@@ -16,20 +16,95 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>System for workflow coordination and execution of Apache Hadoop jobs</comment>
- <version>3.2.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>OOZIE</name>
+ <comment>System for workflow coordination and execution of Apache Hadoop jobs</comment>
+ <version>3.2.0</version>
- <components>
+ <components>
<component>
- <name>OOZIE_SERVER</name>
- <category>MASTER</category>
+ <name>OOZIE_SERVER</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>MAPREDUCE/MAPREDUCE_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ </dependencies>
+ <commandScript>
+ <script>scripts/oozie_server.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
<component>
- <name>OOZIE_CLIENT</name>
- <category>CLIENT</category>
+ <name>OOZIE_CLIENT</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <dependencies>
+ <dependency>
+ <name>HDFS/HDFS_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ <dependency>
+ <name>MAPREDUCE/MAPREDUCE_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ </dependencies>
+ <commandScript>
+ <script>scripts/oozie_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
- </components>
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>oozie.noarch</name>
+ </package>
+ <package>
+ <name>oozie-client.noarch</name>
+ </package>
+ <package>
+ <name>extjs-2.2-1</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>oozie-site</config-type>
+ </configuration-dependencies>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/PIG/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/PIG/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/PIG/metainfo.xml
index 4982fd2..9c0397d 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/PIG/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/PIG/metainfo.xml
@@ -16,15 +16,45 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Scripting platform for analyzing large datasets</comment>
- <version>0.10.1</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>PIG</name>
+ <comment>Scripting platform for analyzing large datasets</comment>
+ <version>0.10.1</version>
- <components>
+ <components>
<component>
- <name>PIG</name>
- <category>CLIENT</category>
+ <name>PIG</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/pig_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
- </components>
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>centos6</osFamily>
+ <packages>
+ <package>
+ <name>pig</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/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/SQOOP/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/SQOOP/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/SQOOP/metainfo.xml
index ae0e68b..9550827 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/SQOOP/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/SQOOP/metainfo.xml
@@ -16,15 +16,58 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Tool for transferring bulk data between Apache Hadoop and structured data stores such as relational databases</comment>
- <version>1.4.2</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>SQOOP</name>
+ <comment>Tool for transferring bulk data between Apache Hadoop and structured data stores such as relational databases</comment>
+ <version>1.4.2</version>
- <components>
+ <components>
<component>
- <name>SQOOP</name>
- <category>CLIENT</category>
+ <name>SQOOP</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <dependencies>
+ <dependency>
+ <name>HDFS/HDFS_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ <dependency>
+ <name>MAPREDUCE/MAPREDUCE_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ </dependencies>
+ <commandScript>
+ <script>scripts/sqoop_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
- </components>
-
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>sqoop</name>
+ </package>
+ <package>
+ <name>mysql-connector-java</name>
+ </package>
+ </packages>
+ </osSpecific>
+ </osSpecifics>
+ <commandScript>
+ <script>scripts/service_check.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>300</timeout>
+ </commandScript>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/WEBHCAT/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/WEBHCAT/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/WEBHCAT/metainfo.xml
index e65992f..5ec4f05 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/WEBHCAT/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/WEBHCAT/metainfo.xml
@@ -16,16 +16,80 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>This is comment for WEBHCAT service</comment>
- <version>0.5.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>WEBHCAT</name>
+ <comment>This is comment for WEBHCAT service</comment>
+ <version>0.5.0</version>
- <components>
+ <components>
<component>
- <name>WEBHCAT_SERVER</name>
- <category>MASTER</category>
+ <name>WEBHCAT_SERVER</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>MAPREDUCE/MAPREDUCE_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>WEBHCAT/WEBHCAT_SERVER</co-locate>
+ </auto-deploy>
+ </dependency>
+ <dependency>
+ <name>ZOOKEEPER/ZOOKEEPER_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ </dependencies>
+ <commandScript>
+ <script>scripts/webhcat_server.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
- </components>
-
-
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>hcatalog</name>
+ </package>
+ <package>
+ <name>webhcat-tar-hive</name>
+ </package>
+ <package>
+ <name>webhcat-tar-pig</name>
+ </package>
+ </packages>
+ </osSpecific>
+ </osSpecifics>
+ <commandScript>
+ <script>scripts/service_check.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>300</timeout>
+ </commandScript>
+ <configuration-dependencies>
+ <config-type>webhcat-site</config-type>
+ </configuration-dependencies>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/ZOOKEEPER/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/ZOOKEEPER/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/ZOOKEEPER/metainfo.xml
index 0e21f4f..53bc6bb 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/ZOOKEEPER/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/ZOOKEEPER/metainfo.xml
@@ -16,20 +16,57 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>This is comment for ZOOKEEPER service</comment>
- <version>3.4.5</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>ZOOKEEPER</name>
+ <comment>This is comment for ZOOKEEPER service</comment>
+ <version>3.4.5</version>
+
+ <components>
- <components>
<component>
- <name>ZOOKEEPER_SERVER</name>
- <category>MASTER</category>
+ <name>ZOOKEEPER_SERVER</name>
+ <category>MASTER</category>
+ <cardinality>1</cardinality>
+ <commandScript>
+ <script>scripts/zookeeper_server.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
<component>
- <name>ZOOKEEPER_CLIENT</name>
- <category>CLIENT</category>
+ <name>ZOOKEEPER_CLIENT</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/zookeeper_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
- </components>
+ </components>
+
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>zookeeper</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>
[4/4] git commit: AMBARI-6239. Remove legacy metainfo.xml V1 support
(ServiceMetainfoXml.java) (dlysnichenko)
Posted by dm...@apache.org.
AMBARI-6239. Remove legacy metainfo.xml V1 support (ServiceMetainfoXml.java) (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/02a46f7d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/02a46f7d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/02a46f7d
Branch: refs/heads/trunk
Commit: 02a46f7d1fd4b2e7a7b45f158e82da9f2b4345ea
Parents: fd8754d
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Mon Jun 23 20:29:27 2014 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Mon Jun 23 20:29:27 2014 +0300
----------------------------------------------------------------------
.../server/api/services/AmbariMetaInfo.java | 4 -
.../server/api/util/StackExtensionHelper.java | 59 ++-----
.../apache/ambari/server/state/ServiceInfo.java | 16 +-
.../server/state/stack/ServiceMetainfoXml.java | 91 ----------
.../server/api/services/AmbariMetaInfoTest.java | 2 +-
.../api/util/StackExtensionHelperTest.java | 5 +-
.../AmbariManagementControllerTest.java | 6 +-
.../stacks/HDP/0.1/services/HDFS/metainfo.xml | 139 ++++++++++++---
.../HDP/0.1/services/MAPREDUCE/metainfo.xml | 83 +++++++--
.../stacks/HDP/0.1/services/PIG/metainfo.xml | 45 ++++-
.../stacks/HDP/0.2/services/HBASE/metainfo.xml | 103 ++++++++++--
.../stacks/HDP/0.2/services/HDFS/metainfo.xml | 117 +++++++++++--
.../stacks/HDP/0.2/services/HIVE/metainfo.xml | 107 ++++++++++--
.../HDP/0.2/services/MAPREDUCE/metainfo.xml | 97 +++++++++--
.../HDP/0.2/services/ZOOKEEPER/metainfo.xml | 53 +++++-
.../resources/stacks/HDP/1.2.0/metainfo.xml | 22 +++
.../HDP/1.2.0/services/GANGLIA/metainfo.xml | 87 ++++++++--
.../HDP/1.2.0/services/HBASE/metainfo.xml | 102 +++++++++--
.../HDP/1.2.0/services/HCATALOG/metainfo.xml | 41 ++++-
.../stacks/HDP/1.2.0/services/HDFS/metainfo.xml | 117 +++++++++++--
.../stacks/HDP/1.2.0/services/HIVE/metainfo.xml | 126 ++++++++++++--
.../HDP/1.2.0/services/MAPREDUCE/metainfo.xml | 67 ++++++--
.../HDP/1.2.0/services/NAGIOS/metainfo.xml | 81 ++++++++-
.../HDP/1.2.0/services/OOZIE/metainfo.xml | 93 +++++++++-
.../stacks/HDP/1.2.0/services/PIG/metainfo.xml | 44 ++++-
.../HDP/1.2.0/services/SQOOP/metainfo.xml | 59 ++++++-
.../HDP/1.2.0/services/WEBHCAT/metainfo.xml | 82 ++++++++-
.../HDP/1.2.0/services/ZOOKEEPER/metainfo.xml | 55 +++++-
.../HDP/1.3.0/services/GANGLIA/metainfo.xml | 87 ++++++++--
.../HDP/1.3.0/services/HBASE/metainfo.xml | 102 +++++++++--
.../HDP/1.3.0/services/HCATALOG/metainfo.xml | 41 ++++-
.../stacks/HDP/1.3.0/services/HDFS/metainfo.xml | 118 +++++++++++--
.../stacks/HDP/1.3.0/services/HIVE/metainfo.xml | 126 ++++++++++++--
.../stacks/HDP/1.3.0/services/HUE/metainfo.xml | 22 ++-
.../HDP/1.3.0/services/MAPREDUCE/metainfo.xml | 67 ++++++--
.../HDP/1.3.0/services/NAGIOS/metainfo.xml | 81 ++++++++-
.../HDP/1.3.0/services/OOZIE/metainfo.xml | 93 +++++++++-
.../stacks/HDP/1.3.0/services/PIG/metainfo.xml | 44 ++++-
.../HDP/1.3.0/services/SQOOP/metainfo.xml | 59 ++++++-
.../HDP/1.3.0/services/WEBHCAT/metainfo.xml | 21 ++-
.../HDP/1.3.0/services/ZOOKEEPER/metainfo.xml | 54 +++++-
.../HDP/1.3.1/services/GANGLIA/metainfo.xml | 87 ++++++++--
.../HDP/1.3.1/services/HBASE/metainfo.xml | 103 ++++++++++--
.../HDP/1.3.1/services/HCATALOG/metainfo.xml | 41 ++++-
.../stacks/HDP/1.3.1/services/HCFS/metainfo.xml | 21 ++-
.../stacks/HDP/1.3.1/services/HDFS/metainfo.xml | 118 +++++++++++--
.../stacks/HDP/1.3.1/services/HIVE/metainfo.xml | 126 ++++++++++++--
.../HDP/1.3.1/services/MAPREDUCE/metainfo.xml | 67 ++++++--
.../HDP/1.3.1/services/NAGIOS/metainfo.xml | 81 ++++++++-
.../HDP/1.3.1/services/NONAME/metainfo.xml | 21 ++-
.../HDP/1.3.1/services/OOZIE/metainfo.xml | 93 +++++++++-
.../stacks/HDP/1.3.1/services/PIG/metainfo.xml | 44 ++++-
.../HDP/1.3.1/services/SQOOP/metainfo.xml | 59 ++++++-
.../HDP/1.3.1/services/WEBHCAT/metainfo.xml | 82 ++++++++-
.../HDP/1.3.1/services/ZOOKEEPER/metainfo.xml | 55 +++++-
.../stacks/HDP/1.3.4/services/HUE/metainfo.xml | 24 +--
.../HDP/2.0.1/services/GANGLIA/metainfo.xml | 115 +++++++++++--
.../HDP/2.0.1/services/HBASE/metainfo.xml | 94 +++++++++--
.../HDP/2.0.1/services/HCATALOG/metainfo.xml | 42 ++++-
.../stacks/HDP/2.0.1/services/HDFS/metainfo.xml | 139 +++++++++++++--
.../stacks/HDP/2.0.1/services/HIVE/metainfo.xml | 139 +++++++++++++--
.../HDP/2.0.1/services/MAPREDUCE2/metainfo.xml | 73 +++++++-
.../HDP/2.0.1/services/NAGIOS/metainfo.xml | 76 ++++++++-
.../HDP/2.0.1/services/OOZIE/metainfo.xml | 123 +++++++++++++-
.../stacks/HDP/2.0.1/services/PIG/metainfo.xml | 46 ++++-
.../stacks/HDP/2.0.1/services/TEZ/metainfo.xml | 20 ++-
.../HDP/2.0.1/services/WEBHCAT/metainfo.xml | 89 +++++++++-
.../stacks/HDP/2.0.1/services/YARN/metainfo.xml | 98 +++++++++--
.../HDP/2.0.1/services/ZOOKEEPER/metainfo.xml | 58 ++++++-
.../HDP/2.0.5/services/GANGLIA/metainfo.xml | 116 +++++++++++--
.../HDP/2.0.5/services/HBASE/metainfo.xml | 94 +++++++++--
.../HDP/2.0.5/services/HCATALOG/metainfo.xml | 42 ++++-
.../stacks/HDP/2.0.5/services/HDFS/metainfo.xml | 168 ++++++++++++++++---
.../stacks/HDP/2.0.5/services/HIVE/metainfo.xml | 138 +++++++++++++--
.../HDP/2.0.5/services/MAPREDUCE2/metainfo.xml | 78 +++++++--
.../HDP/2.0.5/services/OOZIE/metainfo.xml | 123 +++++++++++++-
.../stacks/HDP/2.0.5/services/PIG/metainfo.xml | 46 ++++-
.../HDP/2.0.5/services/SQOOP/metainfo.xml | 59 ++++++-
.../HDP/2.0.5/services/WEBHCAT/metainfo.xml | 89 +++++++++-
.../stacks/HDP/2.0.5/services/YARN/metainfo.xml | 102 +++++++++--
.../HDP/2.0.5/services/ZOOKEEPER/metainfo.xml | 58 ++++++-
.../HDP/2.0.6/services/SQOOP/metainfo.xml | 22 ++-
.../stacks/HDP/2.0.6/services/YARN/metainfo.xml | 124 +++++++++++---
.../stacks/HDP/2.0.7/services/HIVE/metainfo.xml | 165 ++++++++++++++----
84 files changed, 5391 insertions(+), 985 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
index 3675b6a..9bbebf5 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
@@ -92,10 +92,6 @@ public class AmbariMetaInfo {
*/
public static final String ANY_OS = "any";
/**
- * Value for legacy xml files that don't contain schema property
- */
- public static final String SCHEMA_VERSION_LEGACY = "1.0";
- /**
* Version of XML files with support of custom services and custom commands
*/
public static final String SCHEMA_VERSION_2 = "2.0";
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/main/java/org/apache/ambari/server/api/util/StackExtensionHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/util/StackExtensionHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/api/util/StackExtensionHelper.java
index 5700ccf..a044434 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/util/StackExtensionHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/util/StackExtensionHelper.java
@@ -82,7 +82,6 @@ public class StackExtensionHelper {
_jaxbContexts.put(StackMetainfoXml.class, ctx);
_jaxbContexts.put(RepositoryXml.class, ctx);
_jaxbContexts.put(ConfigurationXml.class, ctx);
- _jaxbContexts.put(ServiceMetainfoXml.class, JAXBContext.newInstance(ServiceMetainfoXml.class));
_jaxbContexts.put(ServiceMetainfoV2Xml.class, JAXBContext.newInstance(ServiceMetainfoV2Xml.class));
} catch (JAXBException e) {
throw new RuntimeException (e);
@@ -130,7 +129,6 @@ public class StackExtensionHelper {
mergedServiceInfo.setSchemaVersion(childService.getSchemaVersion());
mergedServiceInfo.setName(childService.getName());
mergedServiceInfo.setComment(childService.getComment());
- mergedServiceInfo.setUser(childService.getUser());
mergedServiceInfo.setVersion(childService.getVersion());
mergedServiceInfo.setConfigDependencies(
childService.getConfigDependencies() != null ?
@@ -399,52 +397,31 @@ public class StackExtensionHelper {
File metricsJson = new File(serviceFolder.getAbsolutePath()
+ File.separator + AmbariMetaInfo.SERVICE_METRIC_FILE_NAME);
String version = getSchemaVersion(metainfoFile);
- if (AmbariMetaInfo.SCHEMA_VERSION_LEGACY.equals(version)) {
- // Get information about service
- ServiceInfo serviceInfo = new ServiceInfo();
- serviceInfo.setSchemaVersion(AmbariMetaInfo.SCHEMA_VERSION_LEGACY);
- serviceInfo.setName(serviceFolder.getName());
- ServiceMetainfoXml smx = unmarshal(ServiceMetainfoXml.class, metainfoFile);
- serviceInfo.setComment(smx.getComment());
- serviceInfo.setUser(smx.getUser());
- serviceInfo.setVersion(smx.getVersion());
- serviceInfo.setDeleted(smx.isDeleted());
- serviceInfo.setConfigDependencies(smx.getConfigDependencies());
- serviceInfo.getComponents().addAll(smx.getComponents());
+ //Reading v2 service metainfo (may contain multiple services)
+ // Get services from metadata
+ ServiceMetainfoV2Xml smiv2x =
+ unmarshal(ServiceMetainfoV2Xml.class, metainfoFile);
+ List<ServiceInfo> serviceInfos = smiv2x.getServices();
+ for (ServiceInfo serviceInfo : serviceInfos) {
+ serviceInfo.setSchemaVersion(AmbariMetaInfo.SCHEMA_VERSION_2);
+
+ // Find service package folder
+ String servicePackageDir = resolveServicePackageFolder(
+ stackRoot.getAbsolutePath(), stackInfo,
+ serviceFolder.getName(), serviceInfo.getName());
+ serviceInfo.setServicePackageFolder(servicePackageDir);
+
+ // process metrics.json
if (metricsJson.exists())
- serviceInfo.setMetricsFile(metricsJson);
+ serviceInfo.setMetricsFile(metricsJson);
// Get all properties from all "configs/*-site.xml" files
setPropertiesFromConfigs(serviceFolder, serviceInfo);
// Add now to be removed while iterating extension graph
services.add(serviceInfo);
- } else { //Reading v2 service metainfo (may contain multiple services)
- // Get services from metadata
- ServiceMetainfoV2Xml smiv2x =
- unmarshal(ServiceMetainfoV2Xml.class, metainfoFile);
- List<ServiceInfo> serviceInfos = smiv2x.getServices();
- for (ServiceInfo serviceInfo : serviceInfos) {
- serviceInfo.setSchemaVersion(AmbariMetaInfo.SCHEMA_VERSION_2);
-
- // Find service package folder
- String servicePackageDir = resolveServicePackageFolder(
- stackRoot.getAbsolutePath(), stackInfo,
- serviceFolder.getName(), serviceInfo.getName());
- serviceInfo.setServicePackageFolder(servicePackageDir);
-
- // process metrics.json
- if (metricsJson.exists())
- serviceInfo.setMetricsFile(metricsJson);
-
- // Get all properties from all "configs/*-site.xml" files
- setPropertiesFromConfigs(serviceFolder, serviceInfo);
-
- // Add now to be removed while iterating extension graph
- services.add(serviceInfo);
}
- }
}
} catch (Exception e) {
LOG.error("Error while parsing metainfo.xml for a service", e);
@@ -542,9 +519,7 @@ public class StackExtensionHelper {
String value = schemaPath.evaluate(doc).trim();
if ( "".equals(value) || // If schemaVersion is not defined
- AmbariMetaInfo.SCHEMA_VERSION_LEGACY.equals(value)) {
- return AmbariMetaInfo.SCHEMA_VERSION_LEGACY;
- } else if (AmbariMetaInfo.SCHEMA_VERSION_2.equals(value)) {
+ AmbariMetaInfo.SCHEMA_VERSION_2.equals(value)) {
return AmbariMetaInfo.SCHEMA_VERSION_2;
} else {
String message = String.format("Unknown schema version %s at file " +
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceInfo.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceInfo.java
index 7faa046..fab4867 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceInfo.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceInfo.java
@@ -40,7 +40,6 @@ public class ServiceInfo {
private String name;
private String version;
- private String user;
private String comment;
private List<PropertyInfo> properties;
@@ -48,6 +47,7 @@ public class ServiceInfo {
@XmlElements(@XmlElement(name="component"))
private List<ComponentInfo> components;
+ @XmlElement(name="deleted")
private boolean isDeleted = false;
@JsonIgnore
@@ -146,14 +146,6 @@ public class ServiceInfo {
this.version = version;
}
- public String getUser() {
- return user;
- }
-
- public void setUser(String user) {
- this.user = user;
- }
-
public String getComment() {
return comment;
}
@@ -200,7 +192,7 @@ public class ServiceInfo {
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("Service name:" + name + "\nversion:" + version +
- "\nuser:" + user + "\ncomment:" + comment);
+ "\ncomment:" + comment);
//for (PropertyInfo property : getProperties()) {
// sb.append("\tProperty name=" + property.getName() +
//"\nproperty value=" + property.getValue() + "\ndescription=" + property.getDescription());
@@ -216,7 +208,7 @@ public class ServiceInfo {
public StackServiceResponse convertToResponse()
{
- return new StackServiceResponse(getName(), getUser(), getComment(), getVersion(),
+ return new StackServiceResponse(getName(), null, getComment(), getVersion(),
getConfigTypes());
}
@@ -294,7 +286,7 @@ public class ServiceInfo {
public String getSchemaVersion() {
if (schemaVersion == null) {
- return AmbariMetaInfo.SCHEMA_VERSION_LEGACY;
+ return AmbariMetaInfo.SCHEMA_VERSION_2;
} else {
return schemaVersion;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/main/java/org/apache/ambari/server/state/stack/ServiceMetainfoXml.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/ServiceMetainfoXml.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/ServiceMetainfoXml.java
deleted file mode 100644
index 9104d95..0000000
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/ServiceMetainfoXml.java
+++ /dev/null
@@ -1,91 +0,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.
- */
-package org.apache.ambari.server.state.stack;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.apache.ambari.server.state.ComponentInfo;
-
-/**
- * Represents the <code>$SERVICE_HOME/metainfo.xml</code> file.
- */
-@XmlRootElement(name="metainfo")
-@XmlAccessorType(XmlAccessType.FIELD)
-public class ServiceMetainfoXml {
- private String user = null;
- private String comment = null;
- private String version = null;
- private boolean deleted = false;
-
- @XmlElementWrapper(name="components")
- @XmlElements(@XmlElement(name="component"))
- private List<ComponentInfo> components;
-
- @XmlElementWrapper(name="configuration-dependencies")
- @XmlElement(name="config-type")
- private List<String> configDependencies;
- /**
- * @return the user
- */
- public String getUser() {
- return user;
- }
-
- /**
- * @return the comment
- */
- public String getComment() {
- return comment;
- }
-
- /**
- * @return the version
- */
- public String getVersion() {
- return version;
- }
-
- /**
- * @return the list of components for the service
- */
- public List<ComponentInfo> getComponents() {
- return components;
- }
-
- /**
- * @return if the service is to be deleted from the parent stack
- */
- public boolean isDeleted() {
- return deleted;
- }
-
- public List<String> getConfigDependencies() {
- return configDependencies;
- }
-
- public void setConfigDependencies(List<String> configDependencies) {
- this.configDependencies = configDependencies;
- }
-}
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
index d806869..71bc1f8 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
@@ -570,7 +570,7 @@ public class AmbariMetaInfoTest {
Assert.assertEquals("mapreduce.shuffle", originalProperty.getValue());
Assert.assertEquals("Auxilliary services of NodeManager",
originalProperty.getDescription());
- Assert.assertEquals(3, redefinedService.getConfigDependencies().size());
+ Assert.assertEquals(7, redefinedService.getConfigDependencies().size());
}
@Test
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/java/org/apache/ambari/server/api/util/StackExtensionHelperTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/util/StackExtensionHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/util/StackExtensionHelperTest.java
index c25575f..6456860 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/util/StackExtensionHelperTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/util/StackExtensionHelperTest.java
@@ -68,8 +68,7 @@ public class StackExtensionHelperTest {
if (serviceInfo.getName().equals("HIVE")) {
// Check old-style service
assertEquals("HIVE", serviceInfo.getName());
- assertEquals("1.0", serviceInfo.getSchemaVersion());
- assertEquals("root", serviceInfo.getUser());
+ assertEquals("2.0", serviceInfo.getSchemaVersion());
assertTrue(serviceInfo.getComment().startsWith("Data warehouse system"));
assertEquals("0.11.0.2.0.5.0", serviceInfo.getVersion());
// Check some component definitions
@@ -252,7 +251,7 @@ public class StackExtensionHelperTest {
File legacyMetaInfoFile = new File("./src/test/resources/stacks/HDP/2.0.7/" +
"services/HIVE/metainfo.xml".replaceAll("/", File.separator));
String version = helper.getSchemaVersion(legacyMetaInfoFile);
- assertEquals("1.0", version);
+ assertEquals("2.0", version);
File v2MetaInfoFile = new File("./src/test/resources/stacks/HDP/2.0.7/" +
"services/HBASE/metainfo.xml".replaceAll("/", File.separator));
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
index 4b7a0a4..7816ad4 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
@@ -152,7 +152,7 @@ public class AmbariManagementControllerTest {
private static final int REPOS_CNT = 3;
private static final int STACKS_CNT = 1;
private static final int STACK_PROPERTIES_CNT = 83;
- private static final int STACK_COMPONENTS_CNT = 3;
+ private static final int STACK_COMPONENTS_CNT = 4;
private static final int OS_CNT = 2;
private static final String NON_EXT_VALUE = "XXX";
@@ -8529,7 +8529,7 @@ public class AmbariManagementControllerTest {
Properties properties = new Properties();
properties.setProperty(Configuration.SERVER_PERSISTENCE_TYPE_KEY, "in-memory");
properties.setProperty(Configuration.METADETA_DIR_PATH,
- "src/main/resources/stacks");
+ "src/test/resources/stacks");
properties.setProperty(Configuration.SERVER_VERSION_FILE,
"target/version");
properties.setProperty(Configuration.OS_VERSION_KEY,
@@ -8712,7 +8712,7 @@ public class AmbariManagementControllerTest {
properties.setProperty(Configuration.SERVER_PERSISTENCE_TYPE_KEY, "in-memory");
properties.setProperty(Configuration.METADETA_DIR_PATH,
- "src/main/resources/stacks");
+ "src/test/resources/stacks");
properties.setProperty(Configuration.SERVER_VERSION_FILE,
"target/version");
properties.setProperty(Configuration.OS_VERSION_KEY,
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/0.1/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/0.1/services/HDFS/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/0.1/services/HDFS/metainfo.xml
index 3c42b9b..f4195a8 100644
--- a/ambari-server/src/test/resources/stacks/HDP/0.1/services/HDFS/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/0.1/services/HDFS/metainfo.xml
@@ -13,42 +13,143 @@
limitations under the License. See accompanying LICENSE file.
-->
<metainfo>
- <user>root</user>
- <comment>This is comment for HDFS service</comment>
- <version>1.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>HDFS</name>
+ <comment>This is comment for HDFS service</comment>
+ <version>1.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>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>DATANODE1</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>DATANODE2</name>
- <category>SLAVE</category>
+ <name>DATANODE1</name>
+ <category>SLAVE</category>
+ <cardinality>1+</cardinality>
+ <commandScript>
+ <script>scripts/datanode.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
<component>
- <name>DATANODE</name>
- <category>SLAVE</category>
+ <name>DATANODE2</name>
+ <category>SLAVE</category>
+ <cardinality>1+</cardinality>
+ <commandScript>
+ <script>scripts/datanode.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>
-
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>lzo</name>
+ </package>
+ <package>
+ <name>hadoop</name>
+ </package>
+ <package>
+ <name>hadoop-libhdfs</name>
+ </package>
+ <package>
+ <name>hadoop-native</name>
+ </package>
+ <package>
+ <name>hadoop-pipes</name>
+ </package>
+ <package>
+ <name>hadoop-sbin</name>
+ </package>
+ <package>
+ <name>hadoop-lzo</name>
+ </package>
+ <package>
+ <name>hadoop-lzo-native</name>
+ </package>
+ <package>
+ <name>snappy</name>
+ </package>
+ <package>
+ <name>snappy-devel</name>
+ </package>
+ <package>
+ <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>
+ <config-type>hdfs-log4j</config-type>
+ </configuration-dependencies>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/0.1/services/MAPREDUCE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/0.1/services/MAPREDUCE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/0.1/services/MAPREDUCE/metainfo.xml
index 2114480..ba9bbe8 100644
--- a/ambari-server/src/test/resources/stacks/HDP/0.1/services/MAPREDUCE/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/0.1/services/MAPREDUCE/metainfo.xml
@@ -13,22 +13,71 @@
limitations under the License. See accompanying LICENSE file.
-->
<metainfo>
- <user>root</user>
- <comment>This is comment for Mapred service</comment>
- <version>1.0</version>
- <components>
- <component>
- <name>JOBTRACKER</name>
- <category>MASTER</category>
- </component>
- <component>
- <name>TASKTRACKER</name>
- <category>SLAVE</category>
- </component>
- <component>
- <name>MAPREDUCE_CLIENT</name>
- <category>CLIENT</category>
- </component>
- </components>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>MAPREDUCE</name>
+ <comment>This is comment for Mapred service</comment>
+ <version>1.0</version>
+ <components>
+ <component>
+ <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>
+ <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>
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/client.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
+ </component>
+
+ </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>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/0.1/services/PIG/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/0.1/services/PIG/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/0.1/services/PIG/metainfo.xml
index c89afa7..6ca5435 100644
--- a/ambari-server/src/test/resources/stacks/HDP/0.1/services/PIG/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/0.1/services/PIG/metainfo.xml
@@ -16,15 +16,46 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>This is comment for PIG service</comment>
- <version>1.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>PIG</name>
+ <comment>This is comment for PIG service</comment>
+ <version>1.0</version>
- <components>
+ <components>
<component>
- <name>PIG</name>
- <category>CLIENT</category>
+ <name>PIG</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/pig_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
- </components>
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>centos6</osFamily>
+ <packages>
+ <package>
+ <name>pig</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/02a46f7d/ambari-server/src/test/resources/stacks/HDP/0.2/services/HBASE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/0.2/services/HBASE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/0.2/services/HBASE/metainfo.xml
index d584d7f..9646d63 100644
--- a/ambari-server/src/test/resources/stacks/HDP/0.2/services/HBASE/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/0.2/services/HBASE/metainfo.xml
@@ -16,27 +16,106 @@
limitations under the License.
-->
<metainfo>
- <user>mapred</user>
- <comment>This is comment for HBASE service</comment>
- <version>1.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>HBASE</name>
+ <comment>This is comment for HBASE service</comment>
+ <version>1.0</version>
-
- <components>
+ <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>
+ </components>
+
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>centos6</osFamily>
+ <packages>
+ <package>
+ <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/02a46f7d/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/metainfo.xml
index 622f0fd..bfe941c 100644
--- a/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/metainfo.xml
@@ -13,27 +13,122 @@
limitations under the License. See accompanying LICENSE file.
-->
<metainfo>
- <user>root</user>
- <comment>This is comment for HDFS service</comment>
- <version>1.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>HDFS</name>
+ <comment>This is comment for HDFS service</comment>
+ <version>1.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>HDFS_CLIENT</name>
- <category>CLIENT</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>
- </components>
+ <component>
+ <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>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>lzo</name>
+ </package>
+ <package>
+ <name>hadoop</name>
+ </package>
+ <package>
+ <name>hadoop-libhdfs</name>
+ </package>
+ <package>
+ <name>hadoop-native</name>
+ </package>
+ <package>
+ <name>hadoop-pipes</name>
+ </package>
+ <package>
+ <name>hadoop-sbin</name>
+ </package>
+ <package>
+ <name>hadoop-lzo</name>
+ </package>
+ <package>
+ <name>hadoop-lzo-native</name>
+ </package>
+ <package>
+ <name>snappy</name>
+ </package>
+ <package>
+ <name>snappy-devel</name>
+ </package>
+ <package>
+ <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>
+ <config-type>hdfs-log4j</config-type>
+ </configuration-dependencies>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/0.2/services/HIVE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/0.2/services/HIVE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/0.2/services/HIVE/metainfo.xml
index 22a86e3..e711dc6 100644
--- a/ambari-server/src/test/resources/stacks/HDP/0.2/services/HIVE/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/0.2/services/HIVE/metainfo.xml
@@ -16,27 +16,112 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>This is comment for HIVE service</comment>
- <version>1.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>HIVE</name>
+ <comment>This is comment for HIVE service</comment>
+ <version>1.0</version>
+ <components>
- <components>
<component>
- <name>HIVE_SERVER</name>
- <category>MASTER</category>
+ <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>MYSQL_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>HIVE_CLIENT</name>
- <category>CLIENT</category>
+ <name>HIVE_CLIENT</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/hive_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
- </components>
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>hive</name>
+ </package>
+ <package>
+ <name>mysql-connector-java</name>
+ </package>
+ <package>
+ <name>mysql</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>centos6</osFamily>
+ <packages>
+ <package>
+ <name>mysql-server</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>centos5</osFamily>
+ <packages>
+ <package>
+ <name>mysql-server</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>suse</osFamily>
+ <packages>
+ <package>
+ <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>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/0.2/services/MAPREDUCE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/0.2/services/MAPREDUCE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/0.2/services/MAPREDUCE/metainfo.xml
index 2114480..d52904f 100644
--- a/ambari-server/src/test/resources/stacks/HDP/0.2/services/MAPREDUCE/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/0.2/services/MAPREDUCE/metainfo.xml
@@ -13,22 +13,85 @@
limitations under the License. See accompanying LICENSE file.
-->
<metainfo>
- <user>root</user>
- <comment>This is comment for Mapred service</comment>
- <version>1.0</version>
- <components>
- <component>
- <name>JOBTRACKER</name>
- <category>MASTER</category>
- </component>
- <component>
- <name>TASKTRACKER</name>
- <category>SLAVE</category>
- </component>
- <component>
- <name>MAPREDUCE_CLIENT</name>
- <category>CLIENT</category>
- </component>
- </components>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>MAPREDUCE</name>
+ <comment>This is comment for Mapred service</comment>
+ <version>1.0</version>
+ <components>
+ <component>
+ <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>
+ <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>
+ <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>
+
+ <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>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/0.2/services/ZOOKEEPER/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/0.2/services/ZOOKEEPER/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/0.2/services/ZOOKEEPER/metainfo.xml
index 7b73682..9f48a9b 100644
--- a/ambari-server/src/test/resources/stacks/HDP/0.2/services/ZOOKEEPER/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/0.2/services/ZOOKEEPER/metainfo.xml
@@ -16,22 +16,57 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Centralized service which provides highly reliable distributed coordination</comment>
- <version>1.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>ZOOKEEPER</name>
+ <comment>Centralized service which provides highly reliable distributed coordination</comment>
+ <version>1.0</version>
+ <components>
- <components>
<component>
- <name>ZOOKEEPER_SERVER</name>
- <category>MASTER</category>
+ <name>ZOOKEEPER_SERVER</name>
+ <category>MASTER</category>
+ <cardinality>1</cardinality>
+ <commandScript>
+ <script>scripts/zookeeper_server.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
<component>
- <name>ZOOKEEPER_CLIENT</name>
- <category>CLIENT</category>
+ <name>ZOOKEEPER_CLIENT</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/zookeeper_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
- </components>
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>zookeeper</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/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.2.0/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.2.0/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.2.0/metainfo.xml
new file mode 100644
index 0000000..ca45822
--- /dev/null
+++ b/ambari-server/src/test/resources/stacks/HDP/1.2.0/metainfo.xml
@@ -0,0 +1,22 @@
+<?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>
+ <versions>
+ <active>true</active>
+ </versions>
+</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/GANGLIA/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/GANGLIA/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/GANGLIA/metainfo.xml
index 0b21f0f..ca15c7b 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/GANGLIA/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/GANGLIA/metainfo.xml
@@ -16,25 +16,82 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Ganglia Metrics Collection system</comment>
- <version>3.2.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>GANGLIA</name>
+ <comment>Ganglia Metrics Collection system</comment>
+ <version>3.2.0</version>
- <components>
+ <components>
<component>
- <name>GANGLIA_SERVER</name>
- <category>MASTER</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>GANGLIA_MONITOR</name>
- <category>SLAVE</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>
-
- <component>
- <name>MONITOR_WEBSERVER</name>
- <category>MASTER</category>
- </component>
- </components>
-
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>libganglia-3.5.0-99</name>
+ </package>
+ <package>
+ <name>ganglia-devel-3.5.0-99</name>
+ </package>
+ <package>
+ <name>ganglia-gmetad-3.5.0-99</name>
+ </package>
+ <package>
+ <name>ganglia-web-3.5.7-99.noarch</name>
+ </package>
+ <package>
+ <name>python-rrdtool.x86_64</name>
+ </package>
+ <package>
+ <name>ganglia-gmond-3.5.0-99</name>
+ </package>
+ <package>
+ <name>ganglia-gmond-modules-python-3.5.0-99</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>suse</osFamily>
+ <package>
+ <name>apache2</name>
+ </package>
+ <package>
+ <name>apache2-mod_php5</name>
+ </package>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>centos6</osFamily>
+ <package>
+ <name>httpd</name>
+ </package>
+ </osSpecific>
+ </osSpecifics>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HBASE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HBASE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HBASE/metainfo.xml
index c91d9f0..355b96c 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HBASE/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HBASE/metainfo.xml
@@ -16,25 +16,105 @@
limitations under the License.
-->
<metainfo>
- <user>mapred</user>
- <comment>Non-relational distributed database and centralized service for configuration management & synchronization</comment>
- <version>0.94.2</version>
+ <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.2</version>
- <components>
+ <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>
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>centos6</osFamily>
+ <packages>
+ <package>
+ <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/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HCATALOG/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HCATALOG/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HCATALOG/metainfo.xml
index 1951a5d..2cf0e49 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HCATALOG/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HCATALOG/metainfo.xml
@@ -16,15 +16,42 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>This is comment for HCATALOG service</comment>
- <version>0.5.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>HCATALOG</name>
+ <comment>This is comment for HCATALOG service</comment>
+ <version>0.5.0</version>
- <components>
+ <components>
<component>
- <name>HCAT</name>
- <category>CLIENT</category>
+ <name>HCAT</name>
+ <category>CLIENT</category>
+ <commandScript>
+ <script>scripts/hcat_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
- </components>
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <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/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HDFS/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HDFS/metainfo.xml
index 1b185e1..cdc9653 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HDFS/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HDFS/metainfo.xml
@@ -16,31 +16,122 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Apache Hadoop Distributed File System</comment>
- <version>1.1.2</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>HDFS</name>
+ <comment>Apache Hadoop Distributed File System</comment>
+ <version>1.1.2</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>
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>lzo</name>
+ </package>
+ <package>
+ <name>hadoop</name>
+ </package>
+ <package>
+ <name>hadoop-libhdfs</name>
+ </package>
+ <package>
+ <name>hadoop-native</name>
+ </package>
+ <package>
+ <name>hadoop-pipes</name>
+ </package>
+ <package>
+ <name>hadoop-sbin</name>
+ </package>
+ <package>
+ <name>hadoop-lzo</name>
+ </package>
+ <package>
+ <name>hadoop-lzo-native</name>
+ </package>
+ <package>
+ <name>snappy</name>
+ </package>
+ <package>
+ <name>snappy-devel</name>
+ </package>
+ <package>
+ <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>
+ <config-type>hdfs-log4j</config-type>
+ </configuration-dependencies>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HIVE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HIVE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HIVE/metainfo.xml
index 6a52064..715853c 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HIVE/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/HIVE/metainfo.xml
@@ -16,28 +16,128 @@
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.10.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.10.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>
+ <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>MYSQL_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>HIVE_CLIENT</name>
- <category>CLIENT</category>
+ <name>HIVE_CLIENT</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/hive_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
- </components>
+ </components>
+
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>hive</name>
+ </package>
+ <package>
+ <name>mysql-connector-java</name>
+ </package>
+ <package>
+ <name>mysql</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>centos6</osFamily>
+ <packages>
+ <package>
+ <name>mysql-server</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>centos5</osFamily>
+ <packages>
+ <package>
+ <name>mysql-server</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>suse</osFamily>
+ <packages>
+ <package>
+ <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>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/MAPREDUCE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/MAPREDUCE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/MAPREDUCE/metainfo.xml
index 79d219b..37adb89 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/MAPREDUCE/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/MAPREDUCE/metainfo.xml
@@ -16,26 +16,71 @@
limitations under the License.
-->
<metainfo>
- <user>mapred</user>
- <comment>Apache Hadoop Distributed Processing Framework</comment>
- <version>1.1.2</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>MAPREDUCE</name>
+ <comment>Apache Hadoop Distributed Processing Framework</comment>
+ <version>1.1.2</version>
- <components>
+ <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>
- </components>
+ </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>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/NAGIOS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/NAGIOS/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/NAGIOS/metainfo.xml
index bd7de07..4b9872f 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/NAGIOS/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/NAGIOS/metainfo.xml
@@ -16,15 +16,80 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Nagios Monitoring and Alerting system</comment>
- <version>3.2.3</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>NAGIOS</name>
+ <comment>Nagios Monitoring and Alerting system</comment>
+ <version>3.2.3</version>
- <components>
+ <components>
<component>
- <name>NAGIOS_SERVER</name>
- <category>MASTER</category>
+ <name>NAGIOS_SERVER</name>
+ <category>MASTER</category>
+ <cardinality>1</cardinality>
+ <commandScript>
+ <script>scripts/nagios_server.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
- </components>
-
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>perl</name>
+ </package>
+ <package>
+ <name>perl-Net-SNMP</name>
+ </package>
+ <package>
+ <name>nagios-plugins-1.4.9</name>
+ </package>
+ <package>
+ <name>nagios-3.5.0-99</name>
+ </package>
+ <package>
+ <name>nagios-www-3.5.0-99</name>
+ </package>
+ <package>
+ <name>nagios-devel-3.5.0-99</name>
+ </package>
+ <package>
+ <name>fping</name>
+ </package>
+ <package>
+ <name>hdp_mon_nagios_addons</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>suse</osFamily>
+ <package>
+ <name>php5-json</name>
+ </package>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>centos5</osFamily>
+ <package>
+ <name>php-pecl-json.x86_64</name>
+ </package>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>redhat5</osFamily>
+ <package>
+ <name>php-pecl-json.x86_64</name>
+ </package>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>oraclelinux5</osFamily>
+ <package>
+ <name>php-pecl-json.x86_64</name>
+ </package>
+ </osSpecific>
+ </osSpecifics>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/OOZIE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/OOZIE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/OOZIE/metainfo.xml
index 83ccb06..cc33a0f 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/OOZIE/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/OOZIE/metainfo.xml
@@ -16,20 +16,95 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>System for workflow coordination and execution of Apache Hadoop jobs</comment>
- <version>3.2.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>OOZIE</name>
+ <comment>System for workflow coordination and execution of Apache Hadoop jobs</comment>
+ <version>3.2.0</version>
- <components>
+ <components>
<component>
- <name>OOZIE_SERVER</name>
- <category>MASTER</category>
+ <name>OOZIE_SERVER</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>MAPREDUCE/MAPREDUCE_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ </dependencies>
+ <commandScript>
+ <script>scripts/oozie_server.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
<component>
- <name>OOZIE_CLIENT</name>
- <category>CLIENT</category>
+ <name>OOZIE_CLIENT</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <dependencies>
+ <dependency>
+ <name>HDFS/HDFS_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ <dependency>
+ <name>MAPREDUCE/MAPREDUCE_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ </dependencies>
+ <commandScript>
+ <script>scripts/oozie_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
- </components>
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>oozie.noarch</name>
+ </package>
+ <package>
+ <name>oozie-client.noarch</name>
+ </package>
+ <package>
+ <name>extjs-2.2-1</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>oozie-site</config-type>
+ </configuration-dependencies>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/PIG/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/PIG/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/PIG/metainfo.xml
index 4982fd2..9c0397d 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/PIG/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/PIG/metainfo.xml
@@ -16,15 +16,45 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Scripting platform for analyzing large datasets</comment>
- <version>0.10.1</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>PIG</name>
+ <comment>Scripting platform for analyzing large datasets</comment>
+ <version>0.10.1</version>
- <components>
+ <components>
<component>
- <name>PIG</name>
- <category>CLIENT</category>
+ <name>PIG</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/pig_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
- </components>
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>centos6</osFamily>
+ <packages>
+ <package>
+ <name>pig</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/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/SQOOP/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/SQOOP/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/SQOOP/metainfo.xml
index ae0e68b..9550827 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/SQOOP/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/SQOOP/metainfo.xml
@@ -16,15 +16,58 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Tool for transferring bulk data between Apache Hadoop and structured data stores such as relational databases</comment>
- <version>1.4.2</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>SQOOP</name>
+ <comment>Tool for transferring bulk data between Apache Hadoop and structured data stores such as relational databases</comment>
+ <version>1.4.2</version>
- <components>
+ <components>
<component>
- <name>SQOOP</name>
- <category>CLIENT</category>
+ <name>SQOOP</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <dependencies>
+ <dependency>
+ <name>HDFS/HDFS_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ <dependency>
+ <name>MAPREDUCE/MAPREDUCE_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ </dependencies>
+ <commandScript>
+ <script>scripts/sqoop_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
- </components>
-
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>sqoop</name>
+ </package>
+ <package>
+ <name>mysql-connector-java</name>
+ </package>
+ </packages>
+ </osSpecific>
+ </osSpecifics>
+ <commandScript>
+ <script>scripts/service_check.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>300</timeout>
+ </commandScript>
+ </service>
+ </services>
</metainfo>
[2/4] AMBARI-6239. Remove legacy metainfo.xml V1 support
(ServiceMetainfoXml.java) (dlysnichenko)
Posted by dm...@apache.org.
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/HUE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/HUE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/HUE/metainfo.xml
index 0a6b59e..fc833f0 100644
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/HUE/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/HUE/metainfo.xml
@@ -16,17 +16,21 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Hue is a graphical user interface to operate and develop
- applications for Apache Hadoop.</comment>
- <version>2.2.0.1.3.3.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>HUE</name>
+ <comment>Hue is a graphical user interface to operate and develop
+ applications for Apache Hadoop.</comment>
+ <version>2.2.0.1.3.3.0</version>
- <components>
+ <components>
<component>
- <name>HUE_SERVER</name>
- <category>MASTER</category>
- <cardinality>1</cardinality>
+ <name>HUE_SERVER</name>
+ <category>MASTER</category>
+ <cardinality>1</cardinality>
</component>
- </components>
-
+ </components>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/GANGLIA/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/GANGLIA/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/GANGLIA/metainfo.xml
index 395bb4f..28f4611 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/GANGLIA/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/GANGLIA/metainfo.xml
@@ -16,21 +16,114 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Ganglia Metrics Collection system</comment>
- <version>3.2.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>GANGLIA</name>
+ <comment>Ganglia Metrics Collection system</comment>
+ <version>3.2.0</version>
- <components>
+ <components>
<component>
- <name>GANGLIA_SERVER</name>
- <category>MASTER</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>GANGLIA_MONITOR</name>
- <category>SLAVE</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>
-
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>python-rrdtool</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>redhat5,redhat6,suse11</osFamily>
+ <packages>
+ <package>
+ <name>libganglia-3.5.0-99</name>
+ </package>
+ <package>
+ <name>ganglia-devel-3.5.0-99</name>
+ </package>
+ <package>
+ <name>ganglia-gmetad-3.5.0-99</name>
+ </package>
+ <package>
+ <name>ganglia-web-3.5.7-99.noarch</name>
+ </package>
+ <package>
+ <name>python-rrdtool.x86_64</name>
+ </package>
+ <package>
+ <name>ganglia-gmond-3.5.0-99</name>
+ </package>
+ <package>
+ <name>ganglia-gmond-modules-python-3.5.0-99</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>debian12</osFamily>
+ <packages>
+ <package>
+ <name>gmetad</name>
+ </package>
+ <package>
+ <name>ganglia-webfrontend</name>
+ </package>
+ <package>
+ <name>ganglia-monitor-python</name>
+ </package>
+ <package>
+ <name>rrdcached</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>suse11</osFamily>
+ <packages>
+ <package>
+ <name>apache2</name>
+ </package>
+ <package>
+ <name>apache2?mod_php*</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>redhat5,redhat6</osFamily>
+ <packages>
+ <package>
+ <name>httpd</name>
+ </package>
+ </packages>
+ </osSpecific>
+ </osSpecifics>
+ <configuration-dependencies>
+ <config-type>global</config-type>
+ </configuration-dependencies>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HBASE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HBASE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HBASE/metainfo.xml
index 645f7ce..b028308 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HBASE/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HBASE/metainfo.xml
@@ -16,25 +16,97 @@
limitations under the License.
-->
<metainfo>
- <user>mapred</user>
- <comment>Non-relational distributed database and centralized service for configuration management & synchronization</comment>
- <version>0.94.5.22-1</version>
+ <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.5.22-1</version>
- <components>
+ <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>
</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>
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <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>
+ <config-type>hbase-log4j</config-type>
+ </configuration-dependencies>
+
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HCATALOG/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HCATALOG/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HCATALOG/metainfo.xml
index 45f3342..bb06eb8 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HCATALOG/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HCATALOG/metainfo.xml
@@ -16,15 +16,41 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>This is comment for HCATALOG service</comment>
- <version>0.5.0.22-1</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>HCATALOG</name>
+ <comment>This is comment for HCATALOG service</comment>
+ <version>0.5.0.22-1</version>
- <components>
+ <components>
<component>
- <name>HCAT</name>
- <category>CLIENT</category>
+ <name>HCAT</name>
+ <category>CLIENT</category>
+ <commandScript>
+ <script>scripts/hcat_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
- </components>
-
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <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/02a46f7d/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HDFS/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HDFS/metainfo.xml
index 1fbfbe6..304064c 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HDFS/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HDFS/metainfo.xml
@@ -16,31 +16,146 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Apache Hadoop Distributed File System</comment>
- <version>2.0.3.22-1</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>HDFS</name>
+ <comment>Apache Hadoop Distributed File System</comment>
+ <version>2.0.3.22-1</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>
+ <!-- TODO: cardinality is conditional on HA usage -->
+ <cardinality>1</cardinality>
+ <category>MASTER</category>
+ <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>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>hadoop</name>
+ </package>
+ <package>
+ <name>hadoop-lzo</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>redhat5,redhat6,suse11</osFamily>
+ <packages>
+ <package>
+ <name>snappy</name>
+ </package>
+ <package>
+ <name>snappy-devel</name>
+ </package>
+ <package>
+ <name>lzo</name>
+ </package>
+ <package>
+ <name>hadoop-lzo-native</name>
+ </package>
+ <package>
+ <name>hadoop-libhdfs</name>
+ </package>
+ <package>
+ <name>ambari-log4j</name>
+ </package>
+ </packages>
+ </osSpecific>
+
+ <osSpecific>
+ <osFamily>debian12</osFamily>
+ <packages>
+ <package>
+ <name>libsnappy1</name>
+ </package>
+ <package>
+ <name>libsnappy-dev</name>
+ </package>
+ <package>
+ <name>liblzo2-2</name>
+ </package>
+ <package>
+ <name>hadoop-hdfs</name>
+ </package>
+ <package>
+ <name>libhdfs0</name>
+ </package>
+ <package>
+ <name>libhdfs0-dev</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>
+ <config-type>hdfs-log4j</config-type>
+ </configuration-dependencies>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HIVE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HIVE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HIVE/metainfo.xml
index c87b494..3846bf4 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HIVE/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HIVE/metainfo.xml
@@ -16,28 +16,141 @@
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.10.0.22-1</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.10.0.22-1</version>
+
+ <components>
- <components>
<component>
- <name>HIVE_METASTORE</name>
- <category>MASTER</category>
+ <name>HIVE_METASTORE</name>
+ <category>MASTER</category>
+ <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>
+ <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>
+ <dependency>
+ <name>TEZ/TEZ_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ <dependency>
+ <name>YARN/YARN_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ <dependency>
+ <name>MAPREDUCE2/MAPREDUCE2_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ </dependencies>
+ <commandScript>
+ <script>scripts/hive_server.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
+
<component>
- <name>MYSQL_SERVER</name>
- <category>MASTER</category>
+ <name>MYSQL_SERVER</name>
+ <category>MASTER</category>
+ <cardinality>1</cardinality>
+ <commandScript>
+ <script>scripts/mysql_server.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
+
<component>
- <name>HIVE_CLIENT</name>
- <category>CLIENT</category>
+ <name>HIVE_CLIENT</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/hive_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
- </components>
+ </components>
+
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>hive</name>
+ </package>
+ <package>
+ <name>mysql-connector-java</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>redhat5,redhat6,suse11</osFamily>
+ <packages>
+ <package>
+ <name>mysql</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>redhat5,redhat6,debian12</osFamily>
+ <packages>
+ <package>
+ <name>mysql-server</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>suse11</osFamily>
+ <packages>
+ <package>
+ <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>hive-log4j</config-type>
+ <config-type>hive-exec-log4j</config-type>
+ </configuration-dependencies>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/MAPREDUCE2/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/MAPREDUCE2/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/MAPREDUCE2/metainfo.xml
index 7c4d1f4..d6f92d1 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/MAPREDUCE2/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/MAPREDUCE2/metainfo.xml
@@ -16,17 +16,72 @@
limitations under the License.
-->
<metainfo>
- <user>mapred</user>
- <comment>Apache Hadoop NextGen MapReduce (client libraries)</comment>
- <version>2.0.3.22-1</version>
- <components>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>MAPREDUCE2</name>
+ <comment>Apache Hadoop NextGen MapReduce (client libraries)</comment>
+ <version>2.0.3.22-1</version>
+ <components>
<component>
- <name>HISTORYSERVER</name>
- <category>MASTER</category>
+ <name>HISTORYSERVER</name>
+ <category>MASTER</category>
+ <cardinality>1</cardinality>
+ <auto-deploy>
+ <enabled>true</enabled>
+ <co-locate>YARN/RESOURCEMANAGER</co-locate>
+ </auto-deploy>
+ <dependencies>
+ <dependency>
+ <name>HDFS/HDFS_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ </dependencies>
+ <commandScript>
+ <script>scripts/historyserver.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
+
<component>
- <name>MAPREDUCE2_CLIENT</name>
- <category>CLIENT</category>
+ <name>MAPREDUCE2_CLIENT</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/mapreduce2_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
- </components>
+ </components>
+
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>hadoop-mapreduce</name>
+ </package>
+ </packages>
+ </osSpecific>
+ </osSpecifics>
+
+ <commandScript>
+ <script>scripts/mapred_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>mapred-site</config-type>
+ <config-type>mapred-queue-acls</config-type>
+ </configuration-dependencies>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/NAGIOS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/NAGIOS/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/NAGIOS/metainfo.xml
index bd7de07..dafd3c3 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/NAGIOS/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/NAGIOS/metainfo.xml
@@ -16,15 +16,75 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Nagios Monitoring and Alerting system</comment>
- <version>3.2.3</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>NAGIOS</name>
+ <comment>Nagios Monitoring and Alerting system</comment>
+ <version>3.2.3</version>
- <components>
+ <components>
<component>
- <name>NAGIOS_SERVER</name>
- <category>MASTER</category>
+ <name>NAGIOS_SERVER</name>
+ <category>MASTER</category>
+ <commandScript>
+ <script>scripts/nagios_server.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
- </components>
-
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>perl</name>
+ </package>
+ <package>
+ <name>perl-Net-SNMP</name>
+ </package>
+ <package>
+ <name>nagios-plugins</name>
+ </package>
+ <package>
+ <name>nagios</name>
+ </package>
+ <package>
+ <name>nagios-www</name>
+ </package>
+ <package>
+ <name>nagios-devel</name>
+ </package>
+ <package>
+ <name>fping</name>
+ </package>
+ <package>
+ <name>hdp_mon_nagios_addons</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>suse11</osFamily>
+ <packages>
+ <package>
+ <name>php5-json</name>
+ </package>
+ <package>
+ <name>apache2-mod_php5</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>redhat5</osFamily>
+ <packages>
+ <package>
+ <name>php-pecl-json.x86_64</name>
+ </package>
+ </packages>
+ </osSpecific>
+ </osSpecifics>
+ <monitoringService>true</monitoringService>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/OOZIE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/OOZIE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/OOZIE/metainfo.xml
index a65b547..6e0c0c9 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/OOZIE/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/OOZIE/metainfo.xml
@@ -16,20 +16,125 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>System for workflow coordination and execution of Apache Hadoop jobs</comment>
- <version>3.3.1</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>OOZIE</name>
+ <comment>System for workflow coordination and execution of Apache Hadoop jobs</comment>
+ <version>3.3.1</version>
- <components>
+ <components>
<component>
- <name>OOZIE_SERVER</name>
- <category>MASTER</category>
+ <name>OOZIE_SERVER</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>MAPREDUCE2/MAPREDUCE2_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ <dependency>
+ <name>YARN/YARN_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ </dependencies>
+ <commandScript>
+ <script>scripts/oozie_server.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
<component>
- <name>OOZIE_CLIENT</name>
- <category>CLIENT</category>
+ <name>OOZIE_CLIENT</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <dependencies>
+ <dependency>
+ <name>HDFS/HDFS_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ <dependency>
+ <name>MAPREDUCE2/MAPREDUCE2_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ </dependencies>
+ <commandScript>
+ <script>scripts/oozie_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
- </components>
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>oozie</name>
+ </package>
+ <package>
+ <name>oozie-client</name>
+ </package>
+ <package>
+ <name>mysql-connector-java</name>
+ </package>
+ </packages>
+ </osSpecific>
+
+ <osSpecific>
+ <osFamily>redhat5,redhat6,suse11</osFamily>
+ <packages>
+ <package>
+ <name>extjs-2.2-1</name>
+ </package>
+ </packages>
+ </osSpecific>
+
+ <osSpecific>
+ <osFamily>debian12</osFamily>
+ <packages>
+ <package>
+ <name>extjs</name>
+ </package>
+ <package>
+ <name>libxml2-utils</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>oozie-site</config-type>
+ <config-type>oozie-log4j</config-type>
+ </configuration-dependencies>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/PIG/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/PIG/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/PIG/metainfo.xml
index 731d7b0..a727179 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/PIG/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/PIG/metainfo.xml
@@ -16,15 +16,47 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Scripting platform for analyzing large datasets</comment>
- <version>0.10.1.22-1</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>PIG</name>
+ <comment>Scripting platform for analyzing large datasets</comment>
+ <version>0.10.1.22-1</version>
- <components>
+ <components>
<component>
- <name>PIG</name>
- <category>CLIENT</category>
+ <name>PIG</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/pig_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
- </components>
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>pig</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>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/02a46f7d/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/TEZ/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/TEZ/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/TEZ/metainfo.xml
index 30aa43e..4ba1371 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/TEZ/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/TEZ/metainfo.xml
@@ -16,15 +16,19 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Tez is the next generation Hadoop Query Processing framework written on top of YARN</comment>
- <version>0.1.0.22-1</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>TEZ</name>
+ <comment>Tez is the next generation Hadoop Query Processing framework written on top of YARN</comment>
+ <version>0.1.0.22-1</version>
- <components>
+ <components>
<component>
- <name>TEZ_CLIENT</name>
- <category>CLIENT</category>
+ <name>TEZ_CLIENT</name>
+ <category>CLIENT</category>
</component>
- </components>
-
+ </components>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/WEBHCAT/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/WEBHCAT/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/WEBHCAT/metainfo.xml
index e65992f..f704159 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/WEBHCAT/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/WEBHCAT/metainfo.xml
@@ -16,16 +16,87 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>This is comment for WEBHCAT service</comment>
- <version>0.5.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>WEBHCAT</name>
+ <comment>This is comment for WEBHCAT service</comment>
+ <version>0.5.0</version>
- <components>
+ <components>
<component>
- <name>WEBHCAT_SERVER</name>
- <category>MASTER</category>
+ <name>WEBHCAT_SERVER</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>MAPREDUCE2/MAPREDUCE2_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>WEBHCAT/WEBHCAT_SERVER</co-locate>
+ </auto-deploy>
+ </dependency>
+ <dependency>
+ <name>ZOOKEEPER/ZOOKEEPER_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ <dependency>
+ <name>YARN/YARN_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ </dependencies>
+ <commandScript>
+ <script>scripts/webhcat_server.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
- </components>
-
-
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>hcatalog</name>
+ </package>
+ <package>
+ <name>webhcat-tar-hive</name>
+ </package>
+ <package>
+ <name>webhcat-tar-pig</name>
+ </package>
+ </packages>
+ </osSpecific>
+ </osSpecifics>
+ <commandScript>
+ <script>scripts/service_check.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>300</timeout>
+ </commandScript>
+ <configuration-dependencies>
+ <config-type>webhcat-site</config-type>
+ </configuration-dependencies>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/YARN/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/YARN/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/YARN/metainfo.xml
index 743c40d..6098637 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/YARN/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/YARN/metainfo.xml
@@ -16,21 +16,95 @@
limitations under the License.
-->
<metainfo>
- <user>mapred</user>
- <comment>Apache Hadoop NextGen MapReduce (YARN)</comment>
- <version>2.0.3.22-1</version>
- <components>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>YARN</name>
+ <comment>Apache Hadoop NextGen MapReduce (YARN)</comment>
+ <version>2.0.3.22-1</version>
+ <components>
+
<component>
- <name>RESOURCEMANAGER</name>
- <category>MASTER</category>
+ <name>RESOURCEMANAGER</name>
+ <category>MASTER</category>
+ <cardinality>1</cardinality>
+ <commandScript>
+ <script>scripts/resourcemanager.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
+ <customCommands>
+ <customCommand>
+ <name>DECOMMISSION</name>
+ <commandScript>
+ <script>scripts/resourcemanager.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
+ </customCommand>
+ <customCommand>
+ <name>REFRESHQUEUES</name>
+ <commandScript>
+ <script>scripts/resourcemanager.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
+ </customCommand>
+ </customCommands>
</component>
+
<component>
- <name>NODEMANAGER</name>
- <category>SLAVE</category>
+ <name>NODEMANAGER</name>
+ <category>SLAVE</category>
+ <cardinality>1+</cardinality>
+ <commandScript>
+ <script>scripts/nodemanager.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
- <component>
- <name>YARN_CLIENT</name>
- <category>CLIENT</category>
+
+ <component>
+ <name>YARN_CLIENT</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/yarn_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
- </components>
+ </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>300</timeout>
+ </commandScript>
+
+ <configuration-dependencies>
+ <config-type>yarn-site</config-type>
+ <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>
+ <config-type>yarn-log4j</config-type>
+ </configuration-dependencies>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/ZOOKEEPER/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/ZOOKEEPER/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/ZOOKEEPER/metainfo.xml
index e72fd2a..ca13ed7 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/ZOOKEEPER/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/ZOOKEEPER/metainfo.xml
@@ -16,20 +16,60 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Centralized service which provides highly reliable distributed coordination</comment>
- <version>3.4.5.22-1</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>ZOOKEEPER</name>
+ <comment>Centralized service which provides highly reliable distributed coordination</comment>
+ <version>3.4.5.22-1</version>
+
+ <components>
- <components>
<component>
- <name>ZOOKEEPER_SERVER</name>
- <category>MASTER</category>
+ <name>ZOOKEEPER_SERVER</name>
+ <category>MASTER</category>
+ <cardinality>1+</cardinality>
+ <commandScript>
+ <script>scripts/zookeeper_server.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
<component>
- <name>ZOOKEEPER_CLIENT</name>
- <category>CLIENT</category>
+ <name>ZOOKEEPER_CLIENT</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/zookeeper_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
- </components>
+ </components>
+
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>zookeeper</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>zookeeper-log4j</config-type>
+ <config-type>zoo.cfg</config-type>
+ </configuration-dependencies>
+ <restartRequiredAfterChange>true</restartRequiredAfterChange>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/GANGLIA/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/GANGLIA/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/GANGLIA/metainfo.xml
index 9f7444b..54018af 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/GANGLIA/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/GANGLIA/metainfo.xml
@@ -16,21 +16,113 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Ganglia Metrics Collection system</comment>
- <version>3.5.0</version>
-
- <components>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>GANGLIA</name>
+ <comment>Ganglia Metrics Collection system (<a href="http://oss.oetiker.ch/rrdtool/" target="_blank">RRDTool</a> will be installed too)</comment>
+ <version>3.5.0</version>
+ <components>
<component>
- <name>GANGLIA_SERVER</name>
- <category>MASTER</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>GANGLIA_MONITOR</name>
- <category>SLAVE</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>
-
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>python-rrdtool</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>redhat5,redhat6,suse11</osFamily>
+ <packages>
+ <package>
+ <name>libganglia-3.5.0-99</name>
+ </package>
+ <package>
+ <name>ganglia-devel-3.5.0-99</name>
+ </package>
+ <package>
+ <name>ganglia-gmetad-3.5.0-99</name>
+ </package>
+ <package>
+ <name>ganglia-web-3.5.7-99.noarch</name>
+ </package>
+ <package>
+ <name>python-rrdtool.x86_64</name>
+ </package>
+ <package>
+ <name>ganglia-gmond-3.5.0-99</name>
+ </package>
+ <package>
+ <name>ganglia-gmond-modules-python-3.5.0-99</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>debian12</osFamily>
+ <packages>
+ <package>
+ <name>gmetad</name>
+ </package>
+ <package>
+ <name>ganglia-webfrontend</name>
+ </package>
+ <package>
+ <name>ganglia-monitor-python</name>
+ </package>
+ <package>
+ <name>rrdcached</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>suse11</osFamily>
+ <packages>
+ <package>
+ <name>apache2</name>
+ </package>
+ <package>
+ <name>apache2?mod_php*</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>redhat5,redhat6</osFamily>
+ <packages>
+ <package>
+ <name>httpd</name>
+ </package>
+ </packages>
+ </osSpecific>
+ </osSpecifics>
+ <configuration-dependencies>
+ <config-type>global</config-type>
+ </configuration-dependencies>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HBASE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HBASE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HBASE/metainfo.xml
index f627b48..0942428 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HBASE/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HBASE/metainfo.xml
@@ -16,25 +16,97 @@
limitations under the License.
-->
<metainfo>
- <user>mapred</user>
- <comment>Non-relational distributed database and centralized service for configuration management & synchronization</comment>
- <version>0.95.2.2.0.5.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>HBASE</name>
+ <comment>Non-relational distributed database and centralized service for configuration management & synchronization</comment>
+ <version>0.95.2.2.0.5.0</version>
- <components>
+ <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>
</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>
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <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>
+ <config-type>hbase-log4j</config-type>
+ </configuration-dependencies>
+
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HCATALOG/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HCATALOG/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HCATALOG/metainfo.xml
index a2f075b..8b26f4a 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HCATALOG/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HCATALOG/metainfo.xml
@@ -16,15 +16,41 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>This is comment for HCATALOG service</comment>
- <version>0.11.0.2.0.5.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>HCATALOG</name>
+ <comment>This is comment for HCATALOG service</comment>
+ <version>0.11.0.2.0.5.0</version>
- <components>
+ <components>
<component>
- <name>HCAT</name>
- <category>CLIENT</category>
+ <name>HCAT</name>
+ <category>CLIENT</category>
+ <commandScript>
+ <script>scripts/hcat_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
- </components>
-
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <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/02a46f7d/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HDFS/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HDFS/metainfo.xml
index d1fc36b..be999e6 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HDFS/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HDFS/metainfo.xml
@@ -16,45 +16,169 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Apache Hadoop Distributed File System</comment>
- <version>2.1.0.2.0.5.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>HDFS</name>
+ <comment>Apache Hadoop Distributed File System</comment>
+ <version>2.1.0.2.0.5.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>
+ <!-- TODO: cardinality is conditional on HA usage -->
+ <cardinality>1</cardinality>
+ <category>MASTER</category>
+ <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>
-
+
<component>
- <name>JOURNALNODE</name>
- <category>MASTER</category>
+ <name>JOURNALNODE</name>
+ <category>SLAVE</category>
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/journalnode.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
<component>
<name>ZKFC</name>
<category>SLAVE</category>
+ <!-- TODO: cardinality is conditional on HA topology -->
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/zkfc_slave.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>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>hadoop</name>
+ </package>
+ <package>
+ <name>hadoop-lzo</name>
+ </package>
+ </packages>
+ </osSpecific>
+
+ <osSpecific>
+ <osFamily>redhat5,redhat6,suse11</osFamily>
+ <packages>
+ <package>
+ <name>snappy</name>
+ </package>
+ <package>
+ <name>snappy-devel</name>
+ </package>
+ <package>
+ <name>lzo</name>
+ </package>
+ <package>
+ <name>hadoop-lzo-native</name>
+ </package>
+ <package>
+ <name>hadoop-libhdfs</name>
+ </package>
+ <package>
+ <name>ambari-log4j</name>
+ </package>
+ </packages>
+ </osSpecific>
+
+ <osSpecific>
+ <osFamily>debian12</osFamily>
+ <packages>
+ <package>
+ <name>libsnappy1</name>
+ </package>
+ <package>
+ <name>libsnappy-dev</name>
+ </package>
+ <package>
+ <name>liblzo2-2</name>
+ </package>
+ <package>
+ <name>hadoop-hdfs</name>
+ </package>
+ <package>
+ <name>libhdfs0</name>
+ </package>
+ <package>
+ <name>libhdfs0-dev</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>
+ <config-type>hdfs-log4j</config-type>
+ </configuration-dependencies>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HIVE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HIVE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HIVE/metainfo.xml
index 7c5ad04..c476538 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HIVE/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HIVE/metainfo.xml
@@ -16,28 +16,140 @@
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.2.0.5.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.2.0.5.0</version>
+ <components>
- <components>
<component>
- <name>HIVE_METASTORE</name>
- <category>MASTER</category>
+ <name>HIVE_METASTORE</name>
+ <category>MASTER</category>
+ <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>
+ <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>
+ <dependency>
+ <name>TEZ/TEZ_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ <dependency>
+ <name>YARN/YARN_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ <dependency>
+ <name>MAPREDUCE2/MAPREDUCE2_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ </dependencies>
+ <commandScript>
+ <script>scripts/hive_server.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
+
<component>
- <name>MYSQL_SERVER</name>
- <category>MASTER</category>
+ <name>MYSQL_SERVER</name>
+ <category>MASTER</category>
+ <cardinality>1</cardinality>
+ <commandScript>
+ <script>scripts/mysql_server.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
+
<component>
- <name>HIVE_CLIENT</name>
- <category>CLIENT</category>
+ <name>HIVE_CLIENT</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/hive_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
- </components>
+ </components>
+
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>hive</name>
+ </package>
+ <package>
+ <name>mysql-connector-java</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>redhat5,redhat6,suse11</osFamily>
+ <packages>
+ <package>
+ <name>mysql</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>redhat5,redhat6,debian12</osFamily>
+ <packages>
+ <package>
+ <name>mysql-server</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>suse11</osFamily>
+ <packages>
+ <package>
+ <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>hive-log4j</config-type>
+ <config-type>hive-exec-log4j</config-type>
+ </configuration-dependencies>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/MAPREDUCE2/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/MAPREDUCE2/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/MAPREDUCE2/metainfo.xml
index 2868140..7539e05 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/MAPREDUCE2/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/MAPREDUCE2/metainfo.xml
@@ -16,22 +16,72 @@
limitations under the License.
-->
<metainfo>
- <user>mapred</user>
- <comment>Apache Hadoop NextGen MapReduce (client libraries)</comment>
- <version>2.1.0.2.0.5.0</version>
- <components>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>MAPREDUCE2</name>
+ <comment>Apache Hadoop NextGen MapReduce (client libraries)</comment>
+ <version>2.1.0.2.0.5.0</version>
+ <components>
<component>
- <name>HISTORYSERVER</name>
- <category>MASTER</category>
+ <name>HISTORYSERVER</name>
+ <category>MASTER</category>
+ <cardinality>1</cardinality>
+ <auto-deploy>
+ <enabled>true</enabled>
+ <co-locate>YARN/RESOURCEMANAGER</co-locate>
+ </auto-deploy>
+ <dependencies>
+ <dependency>
+ <name>HDFS/HDFS_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ </dependencies>
+ <commandScript>
+ <script>scripts/historyserver.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
+
<component>
- <name>MAPREDUCE2_CLIENT</name>
- <category>CLIENT</category>
+ <name>MAPREDUCE2_CLIENT</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/mapreduce2_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>mapred-site</config-type>
- </configuration-dependencies>
+ </components>
+
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>hadoop-mapreduce</name>
+ </package>
+ </packages>
+ </osSpecific>
+ </osSpecifics>
+
+ <commandScript>
+ <script>scripts/mapred_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>mapred-site</config-type>
+ <config-type>mapred-queue-acls</config-type>
+ </configuration-dependencies>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/OOZIE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/OOZIE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/OOZIE/metainfo.xml
index 05e093d..e6d6a7f 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/OOZIE/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/OOZIE/metainfo.xml
@@ -16,20 +16,125 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>System for workflow coordination and execution of Apache Hadoop jobs</comment>
- <version>4.0.0.2.0.5.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>OOZIE</name>
+ <comment>System for workflow coordination and execution of Apache Hadoop jobs</comment>
+ <version>4.0.0.2.0.5.0</version>
- <components>
+ <components>
<component>
- <name>OOZIE_SERVER</name>
- <category>MASTER</category>
+ <name>OOZIE_SERVER</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>MAPREDUCE2/MAPREDUCE2_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ <dependency>
+ <name>YARN/YARN_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ </dependencies>
+ <commandScript>
+ <script>scripts/oozie_server.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
<component>
- <name>OOZIE_CLIENT</name>
- <category>CLIENT</category>
+ <name>OOZIE_CLIENT</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <dependencies>
+ <dependency>
+ <name>HDFS/HDFS_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ <dependency>
+ <name>MAPREDUCE2/MAPREDUCE2_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ </dependencies>
+ <commandScript>
+ <script>scripts/oozie_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
- </components>
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>oozie</name>
+ </package>
+ <package>
+ <name>oozie-client</name>
+ </package>
+ <package>
+ <name>mysql-connector-java</name>
+ </package>
+ </packages>
+ </osSpecific>
+
+ <osSpecific>
+ <osFamily>redhat5,redhat6,suse11</osFamily>
+ <packages>
+ <package>
+ <name>extjs-2.2-1</name>
+ </package>
+ </packages>
+ </osSpecific>
+
+ <osSpecific>
+ <osFamily>debian12</osFamily>
+ <packages>
+ <package>
+ <name>extjs</name>
+ </package>
+ <package>
+ <name>libxml2-utils</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>oozie-site</config-type>
+ <config-type>oozie-log4j</config-type>
+ </configuration-dependencies>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/PIG/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/PIG/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/PIG/metainfo.xml
index 84cf04e..9bb3674 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/PIG/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/PIG/metainfo.xml
@@ -16,15 +16,47 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Scripting platform for analyzing large datasets</comment>
- <version>0.11.1.2.0.5.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>PIG</name>
+ <comment>Scripting platform for analyzing large datasets</comment>
+ <version>0.11.1.2.0.5.0</version>
- <components>
+ <components>
<component>
- <name>PIG</name>
- <category>CLIENT</category>
+ <name>PIG</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <commandScript>
+ <script>scripts/pig_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
- </components>
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>pig</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>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/02a46f7d/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/SQOOP/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/SQOOP/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/SQOOP/metainfo.xml
index 566ba36..92d4500 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/SQOOP/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/SQOOP/metainfo.xml
@@ -16,15 +16,58 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>Tool for transferring bulk data between Apache Hadoop and structured data stores such as relational databases</comment>
- <version>1.4.4.2.0.5.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>SQOOP</name>
+ <comment>Tool for transferring bulk data between Apache Hadoop and structured data stores such as relational databases</comment>
+ <version>1.4.4.2.0.5.0</version>
- <components>
+ <components>
<component>
- <name>SQOOP</name>
- <category>CLIENT</category>
+ <name>SQOOP</name>
+ <category>CLIENT</category>
+ <cardinality>0+</cardinality>
+ <dependencies>
+ <dependency>
+ <name>HDFS/HDFS_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ <dependency>
+ <name>MAPREDUCE2/MAPREDUCE2_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ </dependencies>
+ <commandScript>
+ <script>scripts/sqoop_client.py</script>
+ <scriptType>PYTHON</scriptType>
+ </commandScript>
</component>
- </components>
-
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>sqoop</name>
+ </package>
+ <package>
+ <name>mysql-connector-java</name>
+ </package>
+ </packages>
+ </osSpecific>
+ </osSpecifics>
+ <commandScript>
+ <script>scripts/service_check.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>300</timeout>
+ </commandScript>
+ </service>
+ </services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02a46f7d/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/WEBHCAT/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/WEBHCAT/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/WEBHCAT/metainfo.xml
index 1ee2f7d..f742d99 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/WEBHCAT/metainfo.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/WEBHCAT/metainfo.xml
@@ -16,16 +16,87 @@
limitations under the License.
-->
<metainfo>
- <user>root</user>
- <comment>This is comment for WEBHCAT service</comment>
- <version>0.11.0.2.0.5.0</version>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>WEBHCAT</name>
+ <comment>This is comment for WEBHCAT service</comment>
+ <version>0.11.0.2.0.5.0</version>
- <components>
+ <components>
<component>
- <name>WEBHCAT_SERVER</name>
- <category>MASTER</category>
+ <name>WEBHCAT_SERVER</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>MAPREDUCE2/MAPREDUCE2_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>WEBHCAT/WEBHCAT_SERVER</co-locate>
+ </auto-deploy>
+ </dependency>
+ <dependency>
+ <name>ZOOKEEPER/ZOOKEEPER_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ <dependency>
+ <name>YARN/YARN_CLIENT</name>
+ <scope>host</scope>
+ <auto-deploy>
+ <enabled>true</enabled>
+ </auto-deploy>
+ </dependency>
+ </dependencies>
+ <commandScript>
+ <script>scripts/webhcat_server.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>600</timeout>
+ </commandScript>
</component>
- </components>
-
-
+ </components>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>hcatalog</name>
+ </package>
+ <package>
+ <name>webhcat-tar-hive</name>
+ </package>
+ <package>
+ <name>webhcat-tar-pig</name>
+ </package>
+ </packages>
+ </osSpecific>
+ </osSpecifics>
+ <commandScript>
+ <script>scripts/service_check.py</script>
+ <scriptType>PYTHON</scriptType>
+ <timeout>300</timeout>
+ </commandScript>
+ <configuration-dependencies>
+ <config-type>webhcat-site</config-type>
+ </configuration-dependencies>
+ </service>
+ </services>
</metainfo>