You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2015/05/06 19:26:16 UTC
[1/2] ambari git commit: Revert "AMBARI-10919.
CoordinatorStoreService Removed From Oozie (rlevas)"
Repository: ambari
Updated Branches:
refs/heads/trunk 6182ef3c8 -> 690dfde82
Revert "AMBARI-10919. CoordinatorStoreService Removed From Oozie (rlevas)"
This reverts commit 29e1ad6a178ee17757da1b1faf85123bb6200976.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/03e0836b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/03e0836b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/03e0836b
Branch: refs/heads/trunk
Commit: 03e0836b07e81d31e3ef103517ccb6183da86cde
Parents: 6182ef3
Author: Robert Levas <rl...@hortonworks.com>
Authored: Wed May 6 13:22:19 2015 -0400
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Wed May 6 13:22:19 2015 -0400
----------------------------------------------------------------------
.../common-services/OOZIE/5.0.0.2.3/alerts.json | 44 -----
.../5.0.0.2.3/configuration/oozie-site.xml | 167 -----------------
.../OOZIE/5.0.0.2.3/metainfo.xml | 177 -------------------
.../2.3.GlusterFS/services/OOZIE/metainfo.xml | 48 ++++-
.../stacks/HDP/2.3/services/OOZIE/metainfo.xml | 45 ++++-
.../server/stack/KerberosDescriptorTest.java | 9 +-
6 files changed, 90 insertions(+), 400 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/03e0836b/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/alerts.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/alerts.json b/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/alerts.json
deleted file mode 100644
index 4bfae15..0000000
--- a/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/alerts.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
- "OOZIE": {
- "service": [],
- "OOZIE_SERVER": [
- {
- "name": "oozie_server_webui",
- "label": "Oozie Server Web UI",
- "description": "This host-level alert is triggered if the Oozie server Web UI is unreachable.",
- "interval": 1,
- "scope": "ANY",
- "source": {
- "type": "WEB",
- "uri": {
- "http": "{{oozie-site/oozie.base.url}}/oozie/?user.name=oozie",
- "kerberos_keytab": "{{oozie-site/oozie.authentication.kerberos.keytab}}",
- "kerberos_principal": "{{oozie-site/oozie.authentication.kerberos.principal}}"
- },
- "reporting": {
- "ok": {
- "text": "HTTP {0} response in {2:.3f}s"
- },
- "warning":{
- "text": "HTTP {0} response from {1} in {2:.3f}s ({3})"
- },
- "critical": {
- "text": "Connection failed to {1} ({3})"
- }
- }
- }
- },
- {
- "name": "oozie_server_status",
- "label": "Oozie Server Status",
- "description": "This host-level alert is triggered if the Oozie server cannot be determined to be up and responding to client requests.",
- "interval": 1,
- "scope": "ANY",
- "source": {
- "type": "SCRIPT",
- "path": "OOZIE/4.0.0.2.0/package/alerts/alert_check_oozie_server.py"
- }
- }
- ]
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/03e0836b/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/configuration/oozie-site.xml b/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/configuration/oozie-site.xml
deleted file mode 100644
index b17e4cd..0000000
--- a/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/configuration/oozie-site.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0"?>
-<!--
-~ Licensed to the Apache Software Foundation (ASF) under one
-~ or more contributor license agreements. See the NOTICE file
-~ distributed with this work for additional information
-~ regarding copyright ownership. The ASF licenses this file
-~ to you under the Apache License, Version 2.0 (the
-~ "License"); you may not use this file except in compliance
-~ with the License. You may obtain a copy of the License at
-~
-~ http://www.apache.org/licenses/LICENSE-2.0
-~
-~ Unless required by applicable law or agreed to in writing, software
-~ distributed under the License is distributed on an "AS IS" BASIS,
-~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-~ See the License for the specific language governing permissions and
-~ limitations under the License.
--->
-<configuration supports_final="true" supports_do_not_extend="true">
-
- <property>
- <name>oozie.authentication.kerberos.name.rules</name>
- <value>
- RULE:[2:$1@$0]([jt]t@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-MAPREDUSER/
- RULE:[2:$1@$0]([nd]n@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HDFSUSER/
- RULE:[2:$1@$0](hm@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/
- RULE:[2:$1@$0](rs@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/
- DEFAULT
- </value>
- <description>The mapping from kerberos principal names to local OS user names.</description>
- </property>
-
- <property>
- <name>oozie.authentication.type</name>
- <value>simple</value>
- <description>
- Authentication used for Oozie HTTP endpoint, the supported values are: simple | kerberos |
- #AUTHENTICATION_HANDLER_CLASSNAME#.
- </description>
- </property>
-
- <property>
- <name>oozie.base.url</name>
- <value>http://localhost:11000/oozie</value>
- <description>Base Oozie URL.</description>
- </property>
-
- <property>
- <name>oozie.credentials.credentialclasses</name>
- <value>hcat=org.apache.oozie.action.hadoop.HCatCredentials</value>
- <description>
- Credential Class to be used for HCat.
- </description>
- </property>
-
- <property>
- <name>oozie.service.AuthorizationService.authorization.enabled</name>
- <value>false</value>
- <description>
- Specifies whether security (user name/admin role) is enabled or not.
- If disabled any user can manage Oozie system and manage any job.
- </description>
- </property>
-
- <property>
- <name>oozie.service.HadoopAccessorService.hadoop.configurations</name>
- <value>*=/etc/hadoop/conf</value>
- <description>
- Comma separated AUTHORITY=HADOOP_CONF_DIR, where AUTHORITY is the HOST:PORT of
- the Hadoop service (JobTracker, HDFS). The wildcard '*' configuration is
- used when there is no exact match for an authority. The HADOOP_CONF_DIR contains
- the relevant Hadoop *-site.xml files. If the path is relative is looked within
- the Oozie configuration directory; though the path can be absolute (i.e. to point
- to Hadoop client conf/ directories in the local filesystem.
- </description>
- </property>
-
- <property>
- <name>oozie.service.HadoopAccessorService.kerberos.enabled</name>
- <value>false</value>
- <description>
- Indicates if Oozie is configured to use Kerberos.
- </description>
- </property>
-
- <property>
- <name>oozie.service.URIHandlerService.uri.handlers</name>
- <value>org.apache.oozie.dependency.FSURIHandler,org.apache.oozie.dependency.HCatURIHandler
- </value>
- <description>
- Enlist the different uri handlers supported for data availability checks.
- </description>
- </property>
-
- <property>
- <name>oozie.services.ext</name>
- <value>
- org.apache.oozie.service.JMSAccessorService,org.apache.oozie.service.PartitionDependencyManagerService,org.apache.oozie.service.HCatAccessorService
- </value>
- <description>
- To add/replace services defined in 'oozie.services' with custom implementations.
- Class names must be separated by commas.
- </description>
- </property>
-
- <property>
- <name>oozie.db.schema.name</name>
- <value>oozie</value>
- <description>
- Oozie DataBase Name
- </description>
- </property>
-
- <property>
- <name>oozie.service.JPAService.jdbc.username</name>
- <value>oozie</value>
- <description>
- Database user name to use to connect to the database
- </description>
- </property>
-
- <property require-input="true">
- <name>oozie.service.JPAService.jdbc.password</name>
- <value></value>
- <property-type>PASSWORD</property-type>
- <description>
- DB user password.
-
- IMPORTANT: if password is emtpy leave a 1 space string, the service trims the value,
- if empty Configuration assumes it is NULL.
- </description>
- </property>
-
- <property>
- <name>oozie.service.JPAService.jdbc.driver</name>
- <value>org.apache.derby.jdbc.EmbeddedDriver</value>
- <description>
- JDBC driver class.
- </description>
- </property>
-
- <property>
- <name>oozie.service.JPAService.jdbc.url</name>
- <value>jdbc:derby:${oozie.data.dir}/${oozie.db.schema.name}-db;create=true</value>
- <description>
- JDBC URL.
- </description>
- </property>
-
- <property>
- <name>oozie.service.AuthorizationService.security.enabled</name>
- <value>true</value>
- <description>
- Specifies whether security (user name/admin role) is enabled or not.
- If disabled any user can manage Oozie system and manage any job.
- </description>
- </property>
-
- <property>
- <name>oozie.authentication.simple.anonymous.allowed</name>
- <value>false</value>
- <description>
- Indicates if anonymous requests are allowed when using 'simple' authentication.
- </description>
- </property>
-
-</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/03e0836b/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/metainfo.xml b/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/metainfo.xml
deleted file mode 100644
index 463abc3..0000000
--- a/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/metainfo.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<metainfo>
- <schemaVersion>2.0</schemaVersion>
- <services>
- <service>
- <name>OOZIE</name>
- <extends>common-services/OOZIE/4.0.0.2.0</extends>
- <displayName>Oozie</displayName>
- <comment>System for workflow coordination and execution of Apache Hadoop jobs. This also includes the installation of the optional Oozie Web Console which relies on and will install the <a target="_blank" href="http://www.sencha.com/legal/open-source-faq/">ExtJS</a> Library.
- </comment>
- <version>5.0.0.2.3</version>
- <components>
- <component>
- <name>OOZIE_SERVER</name>
- <displayName>Oozie Server</displayName>
- <category>MASTER</category>
- <cardinality>1</cardinality>
- <versionAdvertised>true</versionAdvertised>
- <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>1200</timeout>
- </commandScript>
- </component>
-
- <component>
- <name>OOZIE_CLIENT</name>
- <displayName>Oozie Client</displayName>
- <category>CLIENT</category>
- <cardinality>1+</cardinality>
- <versionAdvertised>true</versionAdvertised>
- <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>
- <configFiles>
- <configFile>
- <type>xml</type>
- <fileName>oozie-site.xml</fileName>
- <dictionaryName>oozie-site</dictionaryName>
- </configFile>
- <configFile>
- <type>env</type>
- <fileName>oozie-env.sh</fileName>
- <dictionaryName>oozie-env</dictionaryName>
- </configFile>
- <configFile>
- <type>env</type>
- <fileName>oozie-log4j.properties</fileName>
- <dictionaryName>oozie-log4j</dictionaryName>
- </configFile>
- </configFiles>
- </component>
- </components>
-
- <osSpecifics>
- <osSpecific>
- <osFamily>any</osFamily>
- <packages>
- <package>
- <name>zip</name>
- </package>
- <package>
- <name>mysql-connector-java</name>
- </package>
- <package>
- <name>extjs</name>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>redhat5,redhat6,redhat7,suse11</osFamily>
- <packages>
- <package>
- <name>oozie_2_3_*</name>
- </package>
- <package>
- <name>falcon_2_3_*</name>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
- <packages>
- <package>
- <name>oozie-2-3-.*</name>
- </package>
- <package>
- <name>falcon-2-3-.*</name>
- </package>
- <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>
-
- <requiredServices>
- <service>YARN</service>
- </requiredServices>
-
- <configuration-dependencies>
- <config-type>oozie-site</config-type>
- <config-type>oozie-env</config-type>
- <config-type>oozie-log4j</config-type>
- <config-type>yarn-site</config-type>
- <config-type>hive-site</config-type>
- <config-type>tez-site</config-type>
- </configuration-dependencies>
- </service>
- </services>
-</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/03e0836b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/OOZIE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/OOZIE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/OOZIE/metainfo.xml
index fdb65a4..3df7d58 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/OOZIE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/OOZIE/metainfo.xml
@@ -20,7 +20,51 @@
<services>
<service>
<name>OOZIE</name>
- <extends>common-services/OOZIE/5.0.0.2.3</extends>
+ <version>5.0.0.2.3</version>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>zip</name>
+ </package>
+ <package>
+ <name>mysql-connector-java</name>
+ </package>
+ <package>
+ <name>extjs</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>redhat5,redhat6,suse11</osFamily>
+ <packages>
+ <package>
+ <name>oozie_2_3_*</name>
+ </package>
+ <package>
+ <name>falcon_2_3_*</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>ubuntu7,ubuntu12</osFamily>
+ <packages>
+ <package>
+ <name>oozie-2-3-.*</name>
+ </package>
+ <package>
+ <name>falcon-2-3-.*</name>
+ </package>
+ <package>
+ <name>extjs</name>
+ </package>
+ <package>
+ <name>libxml2-utils</name>
+ </package>
+ </packages>
+ </osSpecific>
+ </osSpecifics>
</service>
</services>
-</metainfo>
\ No newline at end of file
+</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/03e0836b/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/metainfo.xml
index fdb65a4..9dcff94 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/metainfo.xml
@@ -20,7 +20,48 @@
<services>
<service>
<name>OOZIE</name>
- <extends>common-services/OOZIE/5.0.0.2.3</extends>
+ <version>5.0.0.2.3</version>
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>zip</name>
+ </package>
+ <package>
+ <name>extjs</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>redhat7,redhat6,suse11</osFamily>
+ <packages>
+ <package>
+ <name>oozie_2_3_*</name>
+ </package>
+ <package>
+ <name>falcon_2_3_*</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
+ <packages>
+ <package>
+ <name>oozie-2-3-.*</name>
+ </package>
+ <package>
+ <name>falcon-2-3-.*</name>
+ </package>
+ <package>
+ <name>extjs</name>
+ </package>
+ <package>
+ <name>libxml2-utils</name>
+ </package>
+ </packages>
+ </osSpecific>
+ </osSpecifics>
</service>
</services>
-</metainfo>
\ No newline at end of file
+</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/03e0836b/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
index 5a23649..f60668f 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
@@ -119,14 +119,7 @@ public class KerberosDescriptorTest {
@Test
public void testCommonOozieServiceDescriptor() throws IOException {
- KerberosDescriptor descriptor;
-
- descriptor = getKerberosDescriptor(commonServicesDirectory, "OOZIE", "4.0.0.2.0");
- Assert.notNull(descriptor);
- Assert.notNull(descriptor.getServices());
- Assert.notNull(descriptor.getService("OOZIE"));
-
- descriptor = getKerberosDescriptor(commonServicesDirectory, "OOZIE", "5.0.0.2.3");
+ KerberosDescriptor descriptor = getKerberosDescriptor(commonServicesDirectory, "OOZIE", "4.0.0.2.0");
Assert.notNull(descriptor);
Assert.notNull(descriptor.getServices());
Assert.notNull(descriptor.getService("OOZIE"));
[2/2] ambari git commit: AMBARI-10919. CoordinatorStoreService
Removed From Oozie (rlevas)
Posted by rl...@apache.org.
AMBARI-10919. CoordinatorStoreService Removed From Oozie (rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/690dfde8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/690dfde8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/690dfde8
Branch: refs/heads/trunk
Commit: 690dfde82eab74d8a6399ec31741d20108fae085
Parents: 03e0836
Author: Robert Levas <rl...@hortonworks.com>
Authored: Wed May 6 13:26:40 2015 -0400
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Wed May 6 13:26:40 2015 -0400
----------------------------------------------------------------------
.../common-services/OOZIE/5.0.0.2.3/alerts.json | 44 +++++
.../5.0.0.2.3/configuration/oozie-site.xml | 167 +++++++++++++++++
.../OOZIE/5.0.0.2.3/metainfo.xml | 177 +++++++++++++++++++
.../2.3.GlusterFS/services/OOZIE/metainfo.xml | 48 +----
.../stacks/HDP/2.3/services/OOZIE/metainfo.xml | 45 +----
.../server/stack/KerberosDescriptorTest.java | 4 +-
6 files changed, 395 insertions(+), 90 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/690dfde8/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/alerts.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/alerts.json b/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/alerts.json
new file mode 100644
index 0000000..4bfae15
--- /dev/null
+++ b/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/alerts.json
@@ -0,0 +1,44 @@
+{
+ "OOZIE": {
+ "service": [],
+ "OOZIE_SERVER": [
+ {
+ "name": "oozie_server_webui",
+ "label": "Oozie Server Web UI",
+ "description": "This host-level alert is triggered if the Oozie server Web UI is unreachable.",
+ "interval": 1,
+ "scope": "ANY",
+ "source": {
+ "type": "WEB",
+ "uri": {
+ "http": "{{oozie-site/oozie.base.url}}/oozie/?user.name=oozie",
+ "kerberos_keytab": "{{oozie-site/oozie.authentication.kerberos.keytab}}",
+ "kerberos_principal": "{{oozie-site/oozie.authentication.kerberos.principal}}"
+ },
+ "reporting": {
+ "ok": {
+ "text": "HTTP {0} response in {2:.3f}s"
+ },
+ "warning":{
+ "text": "HTTP {0} response from {1} in {2:.3f}s ({3})"
+ },
+ "critical": {
+ "text": "Connection failed to {1} ({3})"
+ }
+ }
+ }
+ },
+ {
+ "name": "oozie_server_status",
+ "label": "Oozie Server Status",
+ "description": "This host-level alert is triggered if the Oozie server cannot be determined to be up and responding to client requests.",
+ "interval": 1,
+ "scope": "ANY",
+ "source": {
+ "type": "SCRIPT",
+ "path": "OOZIE/4.0.0.2.0/package/alerts/alert_check_oozie_server.py"
+ }
+ }
+ ]
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/690dfde8/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/configuration/oozie-site.xml b/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/configuration/oozie-site.xml
new file mode 100644
index 0000000..b17e4cd
--- /dev/null
+++ b/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/configuration/oozie-site.xml
@@ -0,0 +1,167 @@
+<?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.
+-->
+<configuration supports_final="true" supports_do_not_extend="true">
+
+ <property>
+ <name>oozie.authentication.kerberos.name.rules</name>
+ <value>
+ RULE:[2:$1@$0]([jt]t@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-MAPREDUSER/
+ RULE:[2:$1@$0]([nd]n@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HDFSUSER/
+ RULE:[2:$1@$0](hm@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/
+ RULE:[2:$1@$0](rs@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/
+ DEFAULT
+ </value>
+ <description>The mapping from kerberos principal names to local OS user names.</description>
+ </property>
+
+ <property>
+ <name>oozie.authentication.type</name>
+ <value>simple</value>
+ <description>
+ Authentication used for Oozie HTTP endpoint, the supported values are: simple | kerberos |
+ #AUTHENTICATION_HANDLER_CLASSNAME#.
+ </description>
+ </property>
+
+ <property>
+ <name>oozie.base.url</name>
+ <value>http://localhost:11000/oozie</value>
+ <description>Base Oozie URL.</description>
+ </property>
+
+ <property>
+ <name>oozie.credentials.credentialclasses</name>
+ <value>hcat=org.apache.oozie.action.hadoop.HCatCredentials</value>
+ <description>
+ Credential Class to be used for HCat.
+ </description>
+ </property>
+
+ <property>
+ <name>oozie.service.AuthorizationService.authorization.enabled</name>
+ <value>false</value>
+ <description>
+ Specifies whether security (user name/admin role) is enabled or not.
+ If disabled any user can manage Oozie system and manage any job.
+ </description>
+ </property>
+
+ <property>
+ <name>oozie.service.HadoopAccessorService.hadoop.configurations</name>
+ <value>*=/etc/hadoop/conf</value>
+ <description>
+ Comma separated AUTHORITY=HADOOP_CONF_DIR, where AUTHORITY is the HOST:PORT of
+ the Hadoop service (JobTracker, HDFS). The wildcard '*' configuration is
+ used when there is no exact match for an authority. The HADOOP_CONF_DIR contains
+ the relevant Hadoop *-site.xml files. If the path is relative is looked within
+ the Oozie configuration directory; though the path can be absolute (i.e. to point
+ to Hadoop client conf/ directories in the local filesystem.
+ </description>
+ </property>
+
+ <property>
+ <name>oozie.service.HadoopAccessorService.kerberos.enabled</name>
+ <value>false</value>
+ <description>
+ Indicates if Oozie is configured to use Kerberos.
+ </description>
+ </property>
+
+ <property>
+ <name>oozie.service.URIHandlerService.uri.handlers</name>
+ <value>org.apache.oozie.dependency.FSURIHandler,org.apache.oozie.dependency.HCatURIHandler
+ </value>
+ <description>
+ Enlist the different uri handlers supported for data availability checks.
+ </description>
+ </property>
+
+ <property>
+ <name>oozie.services.ext</name>
+ <value>
+ org.apache.oozie.service.JMSAccessorService,org.apache.oozie.service.PartitionDependencyManagerService,org.apache.oozie.service.HCatAccessorService
+ </value>
+ <description>
+ To add/replace services defined in 'oozie.services' with custom implementations.
+ Class names must be separated by commas.
+ </description>
+ </property>
+
+ <property>
+ <name>oozie.db.schema.name</name>
+ <value>oozie</value>
+ <description>
+ Oozie DataBase Name
+ </description>
+ </property>
+
+ <property>
+ <name>oozie.service.JPAService.jdbc.username</name>
+ <value>oozie</value>
+ <description>
+ Database user name to use to connect to the database
+ </description>
+ </property>
+
+ <property require-input="true">
+ <name>oozie.service.JPAService.jdbc.password</name>
+ <value></value>
+ <property-type>PASSWORD</property-type>
+ <description>
+ DB user password.
+
+ IMPORTANT: if password is emtpy leave a 1 space string, the service trims the value,
+ if empty Configuration assumes it is NULL.
+ </description>
+ </property>
+
+ <property>
+ <name>oozie.service.JPAService.jdbc.driver</name>
+ <value>org.apache.derby.jdbc.EmbeddedDriver</value>
+ <description>
+ JDBC driver class.
+ </description>
+ </property>
+
+ <property>
+ <name>oozie.service.JPAService.jdbc.url</name>
+ <value>jdbc:derby:${oozie.data.dir}/${oozie.db.schema.name}-db;create=true</value>
+ <description>
+ JDBC URL.
+ </description>
+ </property>
+
+ <property>
+ <name>oozie.service.AuthorizationService.security.enabled</name>
+ <value>true</value>
+ <description>
+ Specifies whether security (user name/admin role) is enabled or not.
+ If disabled any user can manage Oozie system and manage any job.
+ </description>
+ </property>
+
+ <property>
+ <name>oozie.authentication.simple.anonymous.allowed</name>
+ <value>false</value>
+ <description>
+ Indicates if anonymous requests are allowed when using 'simple' authentication.
+ </description>
+ </property>
+
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/690dfde8/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/metainfo.xml b/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/metainfo.xml
new file mode 100644
index 0000000..463abc3
--- /dev/null
+++ b/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/metainfo.xml
@@ -0,0 +1,177 @@
+<?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>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>OOZIE</name>
+ <extends>common-services/OOZIE/4.0.0.2.0</extends>
+ <displayName>Oozie</displayName>
+ <comment>System for workflow coordination and execution of Apache Hadoop jobs. This also includes the installation of the optional Oozie Web Console which relies on and will install the <a target="_blank" href="http://www.sencha.com/legal/open-source-faq/">ExtJS</a> Library.
+ </comment>
+ <version>5.0.0.2.3</version>
+ <components>
+ <component>
+ <name>OOZIE_SERVER</name>
+ <displayName>Oozie Server</displayName>
+ <category>MASTER</category>
+ <cardinality>1</cardinality>
+ <versionAdvertised>true</versionAdvertised>
+ <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>1200</timeout>
+ </commandScript>
+ </component>
+
+ <component>
+ <name>OOZIE_CLIENT</name>
+ <displayName>Oozie Client</displayName>
+ <category>CLIENT</category>
+ <cardinality>1+</cardinality>
+ <versionAdvertised>true</versionAdvertised>
+ <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>
+ <configFiles>
+ <configFile>
+ <type>xml</type>
+ <fileName>oozie-site.xml</fileName>
+ <dictionaryName>oozie-site</dictionaryName>
+ </configFile>
+ <configFile>
+ <type>env</type>
+ <fileName>oozie-env.sh</fileName>
+ <dictionaryName>oozie-env</dictionaryName>
+ </configFile>
+ <configFile>
+ <type>env</type>
+ <fileName>oozie-log4j.properties</fileName>
+ <dictionaryName>oozie-log4j</dictionaryName>
+ </configFile>
+ </configFiles>
+ </component>
+ </components>
+
+ <osSpecifics>
+ <osSpecific>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>zip</name>
+ </package>
+ <package>
+ <name>mysql-connector-java</name>
+ </package>
+ <package>
+ <name>extjs</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>redhat5,redhat6,redhat7,suse11</osFamily>
+ <packages>
+ <package>
+ <name>oozie_2_3_*</name>
+ </package>
+ <package>
+ <name>falcon_2_3_*</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
+ <packages>
+ <package>
+ <name>oozie-2-3-.*</name>
+ </package>
+ <package>
+ <name>falcon-2-3-.*</name>
+ </package>
+ <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>
+
+ <requiredServices>
+ <service>YARN</service>
+ </requiredServices>
+
+ <configuration-dependencies>
+ <config-type>oozie-site</config-type>
+ <config-type>oozie-env</config-type>
+ <config-type>oozie-log4j</config-type>
+ <config-type>yarn-site</config-type>
+ <config-type>hive-site</config-type>
+ <config-type>tez-site</config-type>
+ </configuration-dependencies>
+ </service>
+ </services>
+</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/690dfde8/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/OOZIE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/OOZIE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/OOZIE/metainfo.xml
index 3df7d58..fdb65a4 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/OOZIE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/OOZIE/metainfo.xml
@@ -20,51 +20,7 @@
<services>
<service>
<name>OOZIE</name>
- <version>5.0.0.2.3</version>
- <osSpecifics>
- <osSpecific>
- <osFamily>any</osFamily>
- <packages>
- <package>
- <name>zip</name>
- </package>
- <package>
- <name>mysql-connector-java</name>
- </package>
- <package>
- <name>extjs</name>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>redhat5,redhat6,suse11</osFamily>
- <packages>
- <package>
- <name>oozie_2_3_*</name>
- </package>
- <package>
- <name>falcon_2_3_*</name>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>ubuntu7,ubuntu12</osFamily>
- <packages>
- <package>
- <name>oozie-2-3-.*</name>
- </package>
- <package>
- <name>falcon-2-3-.*</name>
- </package>
- <package>
- <name>extjs</name>
- </package>
- <package>
- <name>libxml2-utils</name>
- </package>
- </packages>
- </osSpecific>
- </osSpecifics>
+ <extends>common-services/OOZIE/5.0.0.2.3</extends>
</service>
</services>
-</metainfo>
+</metainfo>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/690dfde8/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/metainfo.xml
index 9dcff94..fdb65a4 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/metainfo.xml
@@ -20,48 +20,7 @@
<services>
<service>
<name>OOZIE</name>
- <version>5.0.0.2.3</version>
- <osSpecifics>
- <osSpecific>
- <osFamily>any</osFamily>
- <packages>
- <package>
- <name>zip</name>
- </package>
- <package>
- <name>extjs</name>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
- <packages>
- <package>
- <name>oozie_2_3_*</name>
- </package>
- <package>
- <name>falcon_2_3_*</name>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
- <packages>
- <package>
- <name>oozie-2-3-.*</name>
- </package>
- <package>
- <name>falcon-2-3-.*</name>
- </package>
- <package>
- <name>extjs</name>
- </package>
- <package>
- <name>libxml2-utils</name>
- </package>
- </packages>
- </osSpecific>
- </osSpecifics>
+ <extends>common-services/OOZIE/5.0.0.2.3</extends>
</service>
</services>
-</metainfo>
+</metainfo>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/690dfde8/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
index f60668f..54f9ad6 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
@@ -119,7 +119,9 @@ public class KerberosDescriptorTest {
@Test
public void testCommonOozieServiceDescriptor() throws IOException {
- KerberosDescriptor descriptor = getKerberosDescriptor(commonServicesDirectory, "OOZIE", "4.0.0.2.0");
+ KerberosDescriptor descriptor;
+
+ descriptor = getKerberosDescriptor(commonServicesDirectory, "OOZIE", "4.0.0.2.0");
Assert.notNull(descriptor);
Assert.notNull(descriptor.getServices());
Assert.notNull(descriptor.getService("OOZIE"));