aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSean Owen <sowen@cloudera.com>2016-11-19 11:28:25 +0000
committerSean Owen <sowen@cloudera.com>2016-11-19 11:28:25 +0000
commit8b1e1088eb274fb15260cd5d6d9508d42837a4d6 (patch)
tree63ca554047d9ad3bcf12dac9b23d613a9663fda0 /docs
parentd5b1d5fc80153571c308130833d0c0774de62c92 (diff)
downloadspark-8b1e1088eb274fb15260cd5d6d9508d42837a4d6.tar.gz
spark-8b1e1088eb274fb15260cd5d6d9508d42837a4d6.tar.bz2
spark-8b1e1088eb274fb15260cd5d6d9508d42837a4d6.zip
[SPARK-18353][CORE] spark.rpc.askTimeout defalut value is not 120s
## What changes were proposed in this pull request? Avoid hard-coding spark.rpc.askTimeout to non-default in Client; fix doc about spark.rpc.askTimeout default ## How was this patch tested? Existing tests Author: Sean Owen <sowen@cloudera.com> Closes #15833 from srowen/SPARK-18353.
Diffstat (limited to 'docs')
-rw-r--r--docs/configuration.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/configuration.md b/docs/configuration.md
index c021a377ba..a3b4ff01e6 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -1184,7 +1184,7 @@ Apart from these, the following properties are also available, and may be useful
</tr>
<tr>
<td><code>spark.rpc.askTimeout</code></td>
- <td>120s</td>
+ <td><code>spark.network.timeout</code></td>
<td>
Duration for an RPC ask operation to wait before timing out.
</td>
@@ -1566,7 +1566,7 @@ Apart from these, the following properties are also available, and may be useful
</tr>
<tr>
<td><code>spark.core.connection.ack.wait.timeout</code></td>
- <td>60s</td>
+ <td><code>spark.network.timeout</code></td>
<td>
How long for the connection to wait for ack to occur before timing
out and giving up. To avoid unwilling timeout caused by long pause like GC,