Repository: ambari Updated Branches: refs/heads/2.2.1-maint [created] 7bd0a8777
Revert "AMBARI-14839 - DEA is not enabled due to configuration conflict and history log directory can not be changed (Jeff Zhang via jonathanhurley)" This reverts commit 981ede5455c02ae1bd4aac7495c2c667bc889dbc. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c2d27f33 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c2d27f33 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c2d27f33 Branch: refs/heads/2.2.1-maint Commit: c2d27f335110f6f2d880b8959444e81666d0fe77 Parents: 5179e5a Author: Jonathan Hurley <jhur...@hortonworks.com> Authored: Fri Jan 29 11:26:44 2016 -0500 Committer: Mahadev Konar <maha...@apache.org> Committed: Sun Jan 31 18:13:56 2016 -0800 ---------------------------------------------------------------------- .../SPARK/1.2.0.2.2/package/scripts/params.py | 4 +-- .../SPARK/configuration/spark-defaults.xml | 4 +-- .../configuration/spark-thrift-sparkconf.xml | 31 ++++---------------- 3 files changed, 8 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c2d27f33/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py index a25db6f..a681a5c 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py @@ -79,9 +79,7 @@ hive_user = status_params.hive_user spark_group = status_params.spark_group user_group = status_params.user_group spark_hdfs_user_dir = format("/user/{spark_user}") -spark_history_dir = "hdfs:///spark-history" -if 'spark-defaults' in config['configurations'] and 'spark.history.fs.logDirectory' in config['configurations']['spark-defaults']: - spark_history_dir = config['configurations']['spark-defaults']['spark.history.fs.logDirectory'] +spark_history_dir = 'hdfs:///spark-history' spark_history_server_pid_file = status_params.spark_history_server_pid_file spark_thrift_server_pid_file = status_params.spark_thrift_server_pid_file http://git-wip-us.apache.org/repos/asf/ambari/blob/c2d27f33/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml index 1a6552f..d8af790 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml @@ -31,7 +31,7 @@ </property> <property> <name>spark.history.fs.logDirectory</name> - <value>hdfs:///spark-history</value> + <value>{{spark_history_dir}}</value> <description> Base directory for history spark application log. </description> @@ -45,7 +45,7 @@ </property> <property> <name>spark.eventLog.dir</name> - <value>hdfs:///spark-history</value> + <value>{{spark_history_dir}}</value> <description> Base directory in which Spark events are logged, if spark.eventLog.enabled is true. </description> http://git-wip-us.apache.org/repos/asf/ambari/blob/c2d27f33/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml index 2dbfe51..3b13496 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml @@ -75,17 +75,14 @@ <property> <name>spark.history.fs.logDirectory</name> <value>{{spark_history_dir}}</value> - <final>true</final> <description> - Base directory for history spark application log. It is the same value - as in spark-defaults.xml. + Base directory for history spark application log. </description> </property> <property> <name>spark.eventLog.enabled</name> <value>true</value> - <final>true</final> <description> Whether to log Spark events, useful for reconstructing the Web UI after the application has finished. </description> @@ -94,10 +91,8 @@ <property> <name>spark.eventLog.dir</name> <value>{{spark_history_dir}}</value> - <final>true</final> <description> - Base directory in which Spark events are logged, if spark.eventLog.enabled is true. It is the same value - as in spark-defaults.xml. + Base directory in which Spark events are logged, if spark.eventLog.enabled is true. </description> </property> @@ -143,26 +138,10 @@ </property> <property> - <name>spark.dynamicAllocation.initialExecutors</name> - <value>0</value> + <name>spark.executor.instances</name> + <value>2</value> <description> - Initial number of executors to run if dynamic allocation is enabled. - </description> - </property> - - <property> - <name>spark.dynamicAllocation.maxExecutors</name> - <value>10</value> - <description> - Upper bound for the number of executors if dynamic allocation is enabled. - </description> - </property> - - <property> - <name>spark.dynamicAllocation.minExecutors</name> - <value>0</value> - <description> - Lower bound for the number of executors if dynamic allocation is enabled. + The number of executor. </description> </property>
