aboutsummaryrefslogtreecommitdiff
path: root/docs/configuration.md
diff options
context:
space:
mode:
Diffstat (limited to 'docs/configuration.md')
-rw-r--r--docs/configuration.md10
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>