aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornartz <nartzpod@gmail.com>2014-10-09 00:02:11 -0700
committerAndrew Or <andrewor14@gmail.com>2014-10-09 00:02:11 -0700
commit13cab5ba44e2f8d2d2204b3b0d39d7c23a819bdb (patch)
tree11cb5e9a74d1d400dcbbbfa887e027f361dfb9a9
parent86b392942daf61fed2ff7490178b128107a0e856 (diff)
downloadspark-13cab5ba44e2f8d2d2204b3b0d39d7c23a819bdb.tar.gz
spark-13cab5ba44e2f8d2d2204b3b0d39d7c23a819bdb.tar.bz2
spark-13cab5ba44e2f8d2d2204b3b0d39d7c23a819bdb.zip
add spark.driver.memory to config docs
It took me a minute to track this down, so I thought it could be useful to have it in the docs. I'm unsure if 512mb is the default for spark.driver.memory? Also - there could be a better value for the 'description' to differentiate it from spark.executor.memory. Author: nartz <nartzpod@gmail.com> Author: Nathan Artz <nathanartz@Nathans-MacBook-Pro.local> Closes #2410 from nartz/docs/add-spark-driver-memory-to-config-docs and squashes the following commits: a2f6c62 [nartz] Update configuration.md 74521b8 [Nathan Artz] add spark.driver.memory to config docs
-rw-r--r--docs/configuration.md8
1 files changed, 8 insertions, 0 deletions
diff --git a/docs/configuration.md b/docs/configuration.md
index 1c33855365..f311f0d2a6 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -104,6 +104,14 @@ of the most common options to set are:
</td>
</tr>
<tr>
+ <td><code>spark.driver.memory</code></td>
+ <td>512m</td>
+ <td>
+ Amount of memory to use for the driver process, i.e. where SparkContext is initialized.
+ (e.g. <code>512m</code>, <code>2g</code>).
+ </td>
+</tr>
+<tr>
<td><code>spark.serializer</code></td>
<td>org.apache.spark.serializer.<br />JavaSerializer</td>
<td>