Repository: spark Updated Branches: refs/heads/branch-1.3 fada683e7 -> eaffc6edd
SPARK-5930 [DOCS] Documented default of spark.shuffle.io.retryWait is confusing Clarify default max wait in spark.shuffle.io.retryWait docs CC andrewor14 Author: Sean Owen <[email protected]> Closes #4769 from srowen/SPARK-5930 and squashes the following commits: ae2792b [Sean Owen] Clarify default max wait in spark.shuffle.io.retryWait docs (cherry picked from commit 7d8e6a2e44e13a6d6cdcd98a0d0c33b243ef0dc2) Signed-off-by: Reynold Xin <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/eaffc6ed Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/eaffc6ed Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/eaffc6ed Branch: refs/heads/branch-1.3 Commit: eaffc6edd23bc3883c7da74118373477e6d7191b Parents: fada683 Author: Sean Owen <[email protected]> Authored: Wed Feb 25 12:20:44 2015 -0800 Committer: Reynold Xin <[email protected]> Committed: Wed Feb 25 12:20:53 2015 -0800 ---------------------------------------------------------------------- docs/configuration.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/eaffc6ed/docs/configuration.md ---------------------------------------------------------------------- diff --git a/docs/configuration.md b/docs/configuration.md index 541695c..6394c7e 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -967,7 +967,9 @@ Apart from these, the following properties are also available, and may be useful <td>5</td> <td> (Netty only) Seconds to wait between retries of fetches. The maximum delay caused by retrying - is simply <code>maxRetries * retryWait</code>, by default 15 seconds. + is simply <code>maxRetries * retryWait</code>. The default maximum delay is therefore + 15 seconds, because the default value of <code>maxRetries</code> is 3, and the default + <code>retryWait</code> here is 5 seconds. </td> </tr> </table> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
