Repository: ambari Updated Branches: refs/heads/trunk 9652b2313 -> 613110b41
AMBARI-19025. Add livy.spark.master to livy.conf and update spark-blacklist.conf (Jeff Zhang via smohanty) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/613110b4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/613110b4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/613110b4 Branch: refs/heads/trunk Commit: 613110b4194ba13b012778c13ee9e350ec87b774 Parents: 9652b23 Author: Sumit Mohanty <smoha...@hortonworks.com> Authored: Wed Dec 7 16:43:01 2016 -0800 Committer: Sumit Mohanty <smoha...@hortonworks.com> Committed: Wed Dec 7 16:43:01 2016 -0800 ---------------------------------------------------------------------- .../services/SPARK/configuration/livy-conf.xml | 73 ++++++++++++++++++++ .../configuration/livy-spark-blacklist.xml | 52 ++++++++++++++ 2 files changed, 125 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/613110b4/src/main/resources/stacks/HDP/2.6/services/SPARK/configuration/livy-conf.xml ---------------------------------------------------------------------- diff --git a/src/main/resources/stacks/HDP/2.6/services/SPARK/configuration/livy-conf.xml b/src/main/resources/stacks/HDP/2.6/services/SPARK/configuration/livy-conf.xml new file mode 100644 index 0000000..b7bfa73 --- /dev/null +++ b/src/main/resources/stacks/HDP/2.6/services/SPARK/configuration/livy-conf.xml @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * 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"> + <property> + <name>livy.environment</name> + <value>production</value> + <description> + Specifies Livy's environment. May either be "production" or "development". In "development" + mode, Livy will enable debugging options, such as reporting possible routes on a 404. + defaults to development + </description> + <on-ambari-upgrade add="true"/> + </property> + <property> + <name>livy.server.port</name> + <value>8998</value> + <description> + What port to start the server on. Defaults to 8998. + </description> + <on-ambari-upgrade add="true"/> + </property> + <property> + <name>livy.server.session.timeout</name> + <value>3600000</value> + <description> + Time in milliseconds on how long Livy will wait before timing out an idle session. + Default is one hour. + </description> + <on-ambari-upgrade add="true"/> + </property> + <property> + <name>livy.impersonation.enabled</name> + <value>true</value> + <description> + If livy should use proxy users when submitting a job. + </description> + <on-ambari-upgrade add="true"/> + </property> + <property> + <name>livy.server.csrf_protection.enabled</name> + <value>true</value> + <description> + Whether to enable csrf protection for livy's rest api. + </description> + <on-ambari-upgrade add="true"/> + </property> + <property> + <name>livy.spark.master</name> + <value>yarn-cluster</value> + <description> + spark.master property for spark engine + </description> + <on-ambari-upgrade add="true"/> + </property> +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/613110b4/src/main/resources/stacks/HDP/2.6/services/SPARK/configuration/livy-spark-blacklist.xml ---------------------------------------------------------------------- diff --git a/src/main/resources/stacks/HDP/2.6/services/SPARK/configuration/livy-spark-blacklist.xml b/src/main/resources/stacks/HDP/2.6/services/SPARK/configuration/livy-spark-blacklist.xml new file mode 100644 index 0000000..d4f27bf --- /dev/null +++ b/src/main/resources/stacks/HDP/2.6/services/SPARK/configuration/livy-spark-blacklist.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * 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="false" supports_adding_forbidden="true"> + <property> + <name>content</name> + <description>spark-blacklist.properties</description> + <value> +# +# Configuration override / blacklist. Defines a list of properties that users are not allowed +# to override when starting Spark sessions. +# +# This file takes a list of property names (one per line). Empty lines and lines starting with "#" +# are ignored. +# + +# Disallow overriding the master and the deploy mode. +spark.master +spark.submit.deployMode + +# Disallow overriding the location of Spark cached jars. +spark.yarn.jar +spark.yarn.jars +spark.yarn.archive + +# Don't allow users to override the RSC timeout. +livy.rsc.server.idle_timeout + </value> + <value-attributes> + <type>content</type> + <show-property-name>false</show-property-name> + </value-attributes> + <on-ambari-upgrade add="true"/> + </property> +</configuration>
