aboutsummaryrefslogtreecommitdiff
path: root/docs/running-on-yarn.md
diff options
context:
space:
mode:
authorDhruve Ashar <dhruveashar@gmail.com>2016-04-14 10:29:14 -0500
committerTom Graves <tgraves@yahoo-inc.com>2016-04-14 10:29:14 -0500
commitf83ba454a507bec0cc389d9a382cd71add7f17c1 (patch)
tree20d43659775eafa6729794c4a43e29e3bdbc9876 /docs/running-on-yarn.md
parent3cf3db17b35c98a408014e1810cb797d8415ffd3 (diff)
downloadspark-f83ba454a507bec0cc389d9a382cd71add7f17c1.tar.gz
spark-f83ba454a507bec0cc389d9a382cd71add7f17c1.tar.bz2
spark-f83ba454a507bec0cc389d9a382cd71add7f17c1.zip
[SPARK-14572][DOC] Update config docs to allow -Xms in extraJavaOptions
## What changes were proposed in this pull request? The configuration docs are updated to reflect the changes introduced with [SPARK-12384](https://issues.apache.org/jira/browse/SPARK-12384). This allows the user to specify initial heap memory settings through the extraJavaOptions for executor, driver and am. ## How was this patch tested? The changes are tested in [SPARK-12384](https://issues.apache.org/jira/browse/SPARK-12384). This is just documenting the changes made. Author: Dhruve Ashar <dhruveashar@gmail.com> Closes #12333 from dhruve/doc/SPARK-14572.
Diffstat (limited to 'docs/running-on-yarn.md')
-rw-r--r--docs/running-on-yarn.md4
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/running-on-yarn.md b/docs/running-on-yarn.md
index ddc75a70b9..09701abdb0 100644
--- a/docs/running-on-yarn.md
+++ b/docs/running-on-yarn.md
@@ -342,7 +342,9 @@ If you need a reference to the proper location to put log files in the YARN so t
<td>(none)</td>
<td>
A string of extra JVM options to pass to the YARN Application Master in client mode.
- In cluster mode, use <code>spark.driver.extraJavaOptions</code> instead.
+ In cluster mode, use <code>spark.driver.extraJavaOptions</code> instead. Note that it is illegal
+ to set maximum heap size (-Xmx) settings with this option. Maximum heap size settings can be set
+ with <code>spark.yarn.am.memory</code>
</td>
</tr>
<tr>