aboutsummaryrefslogtreecommitdiff
path: root/docs/configuration.md
diff options
context:
space:
mode:
Diffstat (limited to 'docs/configuration.md')
-rw-r--r--docs/configuration.md11
1 files changed, 7 insertions, 4 deletions
diff --git a/docs/configuration.md b/docs/configuration.md
index 937852ffde..16d5be62f9 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -225,11 +225,14 @@ Apart from these, the following properties are also available, and may be useful
<td>(none)</td>
<td>
A string of extra JVM options to pass to the driver. For instance, GC settings or other logging.
+ 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.driver.memory</code> in the cluster mode and through
+ the <code>--driver-memory</code> command line option in the client mode.
<br /><em>Note:</em> In client mode, this config must not be set through the <code>SparkConf</code>
directly in your application, because the driver JVM has already started at that point.
Instead, please set this through the <code>--driver-java-options</code> command line option or in
- your default properties file.</td>
+ your default properties file.
</td>
</tr>
<tr>
@@ -269,9 +272,9 @@ Apart from these, the following properties are also available, and may be useful
<td>(none)</td>
<td>
A string of extra JVM options to pass to executors. For instance, GC settings or other logging.
- Note that it is illegal to set Spark properties or heap size settings with this option. Spark
- properties should be set using a SparkConf object or the spark-defaults.conf file used with the
- spark-submit script. Heap size settings can be set with spark.executor.memory.
+ Note that it is illegal to set Spark properties or maximum heap size (-Xmx) settings with this
+ option. Spark properties should be set using a SparkConf object or the spark-defaults.conf file
+ used with the spark-submit script. Maximum heap size settings can be set with spark.executor.memory.
</td>
</tr>
<tr>