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 /network | |
| 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 'network')
| -rw-r--r-- | network/common/src/main/java/org/apache/spark/network/util/TransportConf.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/network/common/src/main/java/org/apache/spark/network/util/TransportConf.java b/network/common/src/main/java/org/apache/spark/network/util/TransportConf.java index e34382da22..6c91786886 100644 --- a/network/common/src/main/java/org/apache/spark/network/util/TransportConf.java +++ b/network/common/src/main/java/org/apache/spark/network/util/TransportConf.java @@ -37,9 +37,8 @@ public class TransportConf { /** Connect timeout in milliseconds. Default 120 secs. */ public int connectionTimeoutMs() { - int timeout = - conf.getInt("spark.shuffle.io.connectionTimeout", conf.getInt("spark.network.timeout", 100)); - return timeout * 1000; + int defaultTimeout = conf.getInt("spark.network.timeout", 120); + return conf.getInt("spark.shuffle.io.connectionTimeout", defaultTimeout) * 1000; } /** Number of concurrent connections between two nodes for fetching data. */ |