Repository: ambari Updated Branches: refs/heads/branch-2.4 1eee00a2e -> 7c5819713
AMBARI-16757. Spark History Server heap size is not exposed (History Server crashed with OOM) (Weiqing Yang via srimanth) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7c581971 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7c581971 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7c581971 Branch: refs/heads/branch-2.4 Commit: 7c581971390c2e8b41dcab7a3ad4188990f43790 Parents: 1eee00a Author: Srimanth Gunturi <sgunt...@hortonworks.com> Authored: Wed May 25 16:11:38 2016 -0700 Committer: Srimanth Gunturi <sgunt...@hortonworks.com> Committed: Wed May 25 16:12:20 2016 -0700 ---------------------------------------------------------------------- .../SPARK/1.2.1/configuration/spark-env.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/7c581971/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-env.xml b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-env.xml index 80450fd..0e6c630 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-env.xml +++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-env.xml @@ -60,6 +60,17 @@ </value-attributes> </property> + <property> + <name>spark_daemon_memory</name> + <value>1024</value> + <description>Memory for Master, Worker and history server (default: 1G)</description> + <value-attributes> + <type>int</type> + <unit>MB</unit> + </value-attributes> + </property> + + <!-- spark-env.sh --> <property> <name>content</name> @@ -105,6 +116,9 @@ export HADOOP_CONF_DIR=${HADOOP_CONF_DIR:-{{hadoop_conf_dir}}} # The java implementation to use. export JAVA_HOME={{java_home}} +#Memory for Master, Worker and history server (default: 1024MB) +export SPARK_DAEMON_MEMORY={{spark_daemon_memory}} + if [ -d "/etc/tez/conf/" ]; then export TEZ_CONF_DIR=/etc/tez/conf else
