diff options
| author | Varun Saxena <vsaxena.varun@gmail.com> | 2015-01-05 10:32:37 -0800 |
|---|---|---|
| committer | Reynold Xin <rxin@databricks.com> | 2015-01-05 10:32:37 -0800 |
| commit | d3f07fd23cc26a70f44c52e24445974d4885d58a (patch) | |
| tree | c98d0adeda2bc972b4e332f8776b985d6c0255ce /network | |
| parent | 5c506cecb933b156b2f06a688ee08c4347bf0d47 (diff) | |
| download | spark-d3f07fd23cc26a70f44c52e24445974d4885d58a.tar.gz spark-d3f07fd23cc26a70f44c52e24445974d4885d58a.tar.bz2 spark-d3f07fd23cc26a70f44c52e24445974d4885d58a.zip | |
[SPARK-4688] Have a single shared network timeout in Spark
[SPARK-4688] Have a single shared network timeout in Spark
Author: Varun Saxena <vsaxena.varun@gmail.com>
Author: varunsaxena <vsaxena.varun@gmail.com>
Closes #3562 from varunsaxena/SPARK-4688 and squashes the following commits:
6e97f72 [Varun Saxena] [SPARK-4688] Single shared network timeout
cd783a2 [Varun Saxena] SPARK-4688
d6f8c29 [Varun Saxena] SCALA-4688
9562b15 [Varun Saxena] SPARK-4688
a75f014 [varunsaxena] SPARK-4688
594226c [varunsaxena] SPARK-4688
Diffstat (limited to 'network')
| -rw-r--r-- | network/common/src/main/java/org/apache/spark/network/util/TransportConf.java | 4 |
1 files changed, 3 insertions, 1 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 7c9adf52af..e34382da22 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,7 +37,9 @@ public class TransportConf { /** Connect timeout in milliseconds. Default 120 secs. */ public int connectionTimeoutMs() { - return conf.getInt("spark.shuffle.io.connectionTimeout", 120) * 1000; + int timeout = + conf.getInt("spark.shuffle.io.connectionTimeout", conf.getInt("spark.network.timeout", 100)); + return timeout * 1000; } /** Number of concurrent connections between two nodes for fetching data. */ |