You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/04/28 09:34:53 UTC
ambari git commit: AMBARI-10764. Incorrect configuration of
spark-defaults.conf (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk eb31a92a5 -> 673980a06
AMBARI-10764. Incorrect configuration of spark-defaults.conf (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/673980a0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/673980a0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/673980a0
Branch: refs/heads/trunk
Commit: 673980a06887e66a41dd820fe69e21b878412414
Parents: eb31a92
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Tue Apr 28 10:33:57 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Tue Apr 28 10:33:57 2015 +0300
----------------------------------------------------------------------
.../1.2.0.2.2/configuration/spark-defaults.xml | 22 ++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/673980a0/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-defaults.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-defaults.xml b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-defaults.xml
index 2aa2b4e..e34ddaf 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-defaults.xml
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-defaults.xml
@@ -118,7 +118,7 @@
<property>
<name>spark.driver.extraJavaOptions</name>
- <value></value>
+ <value>-Dhdp.version={{hdp_full_version}}</value>
<description>
Specifies parameters that are passed to the JVM of the Spark driver.
</description>
@@ -126,7 +126,7 @@
<property>
<name>spark.yarn.am.extraJavaOptions</name>
- <value></value>
+ <value>-Dhdp.version={{hdp_full_version}}</value>
<description>
Specifies the parameters that are passed to the JVM of the Spark Application Master.
</description>
@@ -147,5 +147,23 @@
Location of the kerberos keytab file for the Spark History Server.
</description>
</property>
+
+ <property>
+ <name>spark.history.provider</name>
+ <value>org.apache.spark.deploy.yarn.history.YarnHistoryProvider</value>
+ <description>Name of history provider class</description>
+ </property>
+
+ <property>
+ <name>spark.yarn.historyServer.address</name>
+ <value>{{spark_history_server_host}}:{{spark_history_ui_port}}</value>
+ <description>The address of the Spark history server (i.e. host.com:18080). The address should not contain a scheme (http://). Defaults to not being set since the history server is an optional service. This address is given to the YARN ResourceManager when the Spark application finishes to link the application from the ResourceManager UI to the Spark history server UI.</description>
+ </property>
+
+ <property>
+ <name>spark.yarn.max.executor.failures</name>
+ <value>3</value>
+ <description>The maximum number of executor failures before failing the application.</description>
+ </property>
</configuration>