From 76d7c0ce2bd9c4d5782fec320279e0a011230625 Mon Sep 17 00:00:00 2001
From: Matei Zaharia <matei@eecs.berkeley.edu>
Date: Mon, 21 Jan 2013 13:10:02 -0800
Subject: Add more Akka settings to docs

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

(limited to 'docs/configuration.md')

diff --git a/docs/configuration.md b/docs/configuration.md
index 87cb4a6797..036a0df480 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -197,6 +197,15 @@ Apart from these, the following properties are also available, and may be useful
     poor data locality, but the default generally works well.
   </td>
 </tr>
+<tr>
+  <td>spark.akka.frameSize</td>
+  <td>10</td>
+  <td>
+    Maximum message size to allow in "control plane" communication (for serialized tasks and task
+    results), in MB. Increase this if your tasks need to send back large results to the master
+    (e.g. using <code>collect()</code> on a large dataset).
+  </td>
+</tr>
 <tr>
   <td>spark.akka.threads</td>
   <td>4</td>
@@ -205,6 +214,13 @@ Apart from these, the following properties are also available, and may be useful
     when the master has a lot of CPU cores.
   </td>
 </tr>
+<tr>
+  <td>spark.akka.timeout</td>
+  <td>20</td>
+  <td>
+    Communication timeout between Spark nodes.
+  </td>
+</tr>
 <tr>
   <td>spark.master.host</td>
   <td>(local hostname)</td>
-- 
cgit v1.2.3