diff options
| author | Kousuke Saruta <sarutak@oss.nttdata.co.jp> | 2014-08-16 14:15:58 -0700 |
|---|---|---|
| committer | Josh Rosen <joshrosen@apache.org> | 2014-08-16 14:15:58 -0700 |
| commit | 76fa0eaf515fd6771cdd69422b1259485debcae5 (patch) | |
| tree | 44964bbdc24431aa7de67e9c720c7494ae1eefd4 /docs/configuration.md | |
| parent | 4bdfaa16fce399bd97c98858151246b3b02f350f (diff) | |
| download | spark-76fa0eaf515fd6771cdd69422b1259485debcae5.tar.gz spark-76fa0eaf515fd6771cdd69422b1259485debcae5.tar.bz2 spark-76fa0eaf515fd6771cdd69422b1259485debcae5.zip | |
[SPARK-2677] BasicBlockFetchIterator#next can wait forever
Author: Kousuke Saruta <sarutak@oss.nttdata.co.jp>
Closes #1632 from sarutak/SPARK-2677 and squashes the following commits:
cddbc7b [Kousuke Saruta] Removed Exception throwing when ConnectionManager#handleMessage receives ack for non-referenced message
d3bd2a8 [Kousuke Saruta] Modified configuration.md for spark.core.connection.ack.timeout
e85f88b [Kousuke Saruta] Removed useless synchronized blocks
7ed48be [Kousuke Saruta] Modified ConnectionManager to use ackTimeoutMonitor ConnectionManager-wide
9b620a6 [Kousuke Saruta] Merge branch 'master' of git://git.apache.org/spark into SPARK-2677
0dd9ad3 [Kousuke Saruta] Modified typo in ConnectionManagerSuite.scala
7cbb8ca [Kousuke Saruta] Modified to match with scalastyle
8a73974 [Kousuke Saruta] Merge branch 'master' of git://git.apache.org/spark into SPARK-2677
ade279a [Kousuke Saruta] Merge branch 'master' of git://git.apache.org/spark into SPARK-2677
0174d6a [Kousuke Saruta] Modified ConnectionManager.scala to handle the case remote Executor cannot ack
a454239 [Kousuke Saruta] Merge branch 'master' of git://git.apache.org/spark into SPARK-2677
9b7b7c1 [Kousuke Saruta] (WIP) Modifying ConnectionManager.scala
Diffstat (limited to 'docs/configuration.md')
| -rw-r--r-- | docs/configuration.md | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/docs/configuration.md b/docs/configuration.md index c408c468dc..981170d8b4 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -885,6 +885,15 @@ Apart from these, the following properties are also available, and may be useful </td> </tr> <tr> + <td><code>spark.core.connection.ack.wait.timeout</code></td> + <td>60</td> + <td> + Number of seconds 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, + you can set larger value. + </td> +</tr> +<tr> <td><code>spark.ui.filters</code></td> <td>None</td> <td> |