You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2014/10/09 09:02:33 UTC

git commit: add spark.driver.memory to config docs

Repository: spark
Updated Branches:
  refs/heads/master 86b392942 -> 13cab5ba4


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 <na...@gmail.com>
Author: Nathan Artz <na...@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


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/13cab5ba
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/13cab5ba
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/13cab5ba

Branch: refs/heads/master
Commit: 13cab5ba44e2f8d2d2204b3b0d39d7c23a819bdb
Parents: 86b3929
Author: nartz <na...@gmail.com>
Authored: Thu Oct 9 00:02:11 2014 -0700
Committer: Andrew Or <an...@gmail.com>
Committed: Thu Oct 9 00:02:11 2014 -0700

----------------------------------------------------------------------
 docs/configuration.md | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/13cab5ba/docs/configuration.md
----------------------------------------------------------------------
diff --git a/docs/configuration.md b/docs/configuration.md
index 1c33855..f311f0d 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>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org