diff options
| author | Varun Saxena <vsaxena.varun@gmail.com> | 2015-01-05 10:32:37 -0800 |
|---|---|---|
| committer | Reynold Xin <rxin@databricks.com> | 2015-01-05 10:32:37 -0800 |
| commit | d3f07fd23cc26a70f44c52e24445974d4885d58a (patch) | |
| tree | c98d0adeda2bc972b4e332f8776b985d6c0255ce /docs/configuration.md | |
| parent | 5c506cecb933b156b2f06a688ee08c4347bf0d47 (diff) | |
| download | spark-d3f07fd23cc26a70f44c52e24445974d4885d58a.tar.gz spark-d3f07fd23cc26a70f44c52e24445974d4885d58a.tar.bz2 spark-d3f07fd23cc26a70f44c52e24445974d4885d58a.zip | |
[SPARK-4688] Have a single shared network timeout in Spark
[SPARK-4688] Have a single shared network timeout in Spark
Author: Varun Saxena <vsaxena.varun@gmail.com>
Author: varunsaxena <vsaxena.varun@gmail.com>
Closes #3562 from varunsaxena/SPARK-4688 and squashes the following commits:
6e97f72 [Varun Saxena] [SPARK-4688] Single shared network timeout
cd783a2 [Varun Saxena] SPARK-4688
d6f8c29 [Varun Saxena] SCALA-4688
9562b15 [Varun Saxena] SPARK-4688
a75f014 [varunsaxena] SPARK-4688
594226c [varunsaxena] SPARK-4688
Diffstat (limited to 'docs/configuration.md')
| -rw-r--r-- | docs/configuration.md | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/docs/configuration.md b/docs/configuration.md index 9bb6499993..7ada67fc30 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -819,6 +819,16 @@ Apart from these, the following properties are also available, and may be useful </td> </tr> <tr> + <td><code>spark.network.timeout</code></td> + <td>100</td> + <td> + Default timeout for all network interactions, in seconds. This config will be used in + place of <code>spark.core.connection.ack.wait.timeout</code>, <code>spark.akka.timeout</code>, + <code>spark.storage.blockManagerSlaveTimeoutMs</code> or <code>spark.shuffle.io.connectionTimeout</code>, + if they are not configured. + </td> +</tr> +<tr> <td><code>spark.akka.heartbeat.pauses</code></td> <td>6000</td> <td> |