aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorPatrick Wendell <pwendell@gmail.com>2014-01-07 00:54:25 -0800
committerPatrick Wendell <pwendell@gmail.com>2014-01-07 00:54:25 -0800
commitc3cf0475e8f5fc1a5322ed12ffebca80a1dd0824 (patch)
treedfc5f221868f8e83430d4d3de3d4b37f9f042802 /docs
parenta862cafacf555373b5fdbafb4c9c4d712b191648 (diff)
parentc729fa7c8ed733a778a7201ed17bf74f3e132845 (diff)
downloadspark-c3cf0475e8f5fc1a5322ed12ffebca80a1dd0824.tar.gz
spark-c3cf0475e8f5fc1a5322ed12ffebca80a1dd0824.tar.bz2
spark-c3cf0475e8f5fc1a5322ed12ffebca80a1dd0824.zip
Merge pull request #339 from ScrapCodes/conf-improvements
Conf improvements There are two new features. 1. Allow users to set arbitrary akka configurations via spark conf. 2. Allow configuration to be printed in logs for diagnosis.
Diffstat (limited to 'docs')
-rw-r--r--docs/configuration.md15
1 files changed, 15 insertions, 0 deletions
diff --git a/docs/configuration.md b/docs/configuration.md
index 09342fedfc..1d36ecb9c1 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -361,6 +361,14 @@ Apart from these, the following properties are also available, and may be useful
</td>
</tr>
<tr>
+ <td>akka.x.y....</td>
+ <td>value</td>
+ <td>
+ An arbitrary akka configuration can be set directly on spark conf and it is applied for all the ActorSystems created spark wide for that SparkContext and its assigned executors as well.
+ </td>
+</tr>
+
+<tr>
<td>spark.shuffle.consolidateFiles</td>
<td>false</td>
<td>
@@ -395,6 +403,13 @@ Apart from these, the following properties are also available, and may be useful
How many times slower a task is than the median to be considered for speculation.
</td>
</tr>
+<tr>
+ <td>spark.log-conf</td>
+ <td>false</td>
+ <td>
+ Log the supplied SparkConf as INFO at start of spark context.
+ </td>
+</tr>
</table>
## Viewing Spark Properties