diff options
| author | Reynold Xin <rxin@databricks.com> | 2015-01-05 15:19:53 -0800 |
|---|---|---|
| committer | Reynold Xin <rxin@databricks.com> | 2015-01-05 15:19:53 -0800 |
| commit | bbcba3a9430365640c0188e7ca6e0677d3227dd8 (patch) | |
| tree | cab3b258e583535916220f0c69b06a1cfd8679d2 /docs | |
| parent | 6c6f32574023b8e43a24f2081ff17e6e446de2f3 (diff) | |
| download | spark-bbcba3a9430365640c0188e7ca6e0677d3227dd8.tar.gz spark-bbcba3a9430365640c0188e7ca6e0677d3227dd8.tar.bz2 spark-bbcba3a9430365640c0188e7ca6e0677d3227dd8.zip | |
[SPARK-5093] Set spark.network.timeout to 120s consistently.
Author: Reynold Xin <rxin@databricks.com>
Closes #3903 from rxin/timeout-120 and squashes the following commits:
7c2138e [Reynold Xin] [SPARK-5093] Set spark.network.timeout to 120s consistently.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/configuration.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/configuration.md b/docs/configuration.md index 7ada67fc30..2add48569b 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -820,12 +820,12 @@ Apart from these, the following properties are also available, and may be useful </tr> <tr> <td><code>spark.network.timeout</code></td> - <td>100</td> + <td>120</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. + <code>spark.storage.blockManagerSlaveTimeoutMs</code> or + <code>spark.shuffle.io.connectionTimeout</code>, if they are not configured. </td> </tr> <tr> |