You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2016/06/22 23:07:05 UTC
ambari git commit: AMBARI-17209. Ambari should add default Spark
configuration property in Oozie configuration settings (Venkat Ranganathan
via alejandro)
Repository: ambari
Updated Branches:
refs/heads/trunk dfde8ba4d -> 1d50bc7cd
AMBARI-17209. Ambari should add default Spark configuration property in Oozie configuration settings (Venkat Ranganathan via alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1d50bc7c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1d50bc7c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1d50bc7c
Branch: refs/heads/trunk
Commit: 1d50bc7cde396ecfaca02eb0aa618d044a0e9d53
Parents: dfde8ba
Author: Alejandro Fernandez <af...@hortonworks.com>
Authored: Wed Jun 22 16:08:53 2016 -0700
Committer: Alejandro Fernandez <af...@hortonworks.com>
Committed: Wed Jun 22 16:08:53 2016 -0700
----------------------------------------------------------------------
.../4.2.0.2.5/configuration/oozie-site.xml | 34 ++++++++++++++++++++
1 file changed, 34 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d50bc7c/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.5/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.5/configuration/oozie-site.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.5/configuration/oozie-site.xml
new file mode 100644
index 0000000..2778a72
--- /dev/null
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.5/configuration/oozie-site.xml
@@ -0,0 +1,34 @@
+<?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.service.SparkConfigurationService.spark.configurations</name>
+ <value>*=spark-conf</value>
+ <description>
+ Comma separated AUTHORITY=SPARK_CONF_DIR, where AUTHORITY is the
+ HOST:PORT of the ResourceManager of a YARN cluster. The wildcard '*'
+ configuration is used when there is no exact match for an authority.
+ The SPARK_CONF_DIR contains the relevant spark-defaults.conf properties
+ file. If the path is relative is looked within the Oozie configuration
+ directory; though the path can be absolute. This is only used when the
+ Spark master is set to either "yarn-client" or "yarn-cluster".
+ </description>
+ <on-ambari-upgrade add="true"/>
+ </property>
+</configuration>