diff --git a/core/src/main/scala/org/apache/spark/util/RpcUtils.scala b/core/src/main/scala/org/apache/spark/util/RpcUtils.scala index 5ae793e0e87a3..5ccb0aa7f0736 100644 --- a/core/src/main/scala/org/apache/spark/util/RpcUtils.scala +++ b/core/src/main/scala/org/apache/spark/util/RpcUtils.scala @@ -48,11 +48,13 @@ object RpcUtils { /** Returns the default Spark timeout to use for RPC ask operations. */ def askTimeout(conf: SparkConf): FiniteDuration = { - conf.getTimeAsSeconds("spark.rpc.askTimeout", "30s") seconds + conf.getTimeAsSeconds("spark.rpc.askTimeout", + conf.get("spark.network.timeout", "30s")) seconds } /** Returns the default Spark timeout to use for RPC remote endpoint lookup. */ def lookupTimeout(conf: SparkConf): FiniteDuration = { - conf.getTimeAsSeconds("spark.rpc.lookupTimeout", "30s") seconds + conf.getTimeAsSeconds("spark.rpc.lookupTimeout", + conf.get("spark.network.timeout", "30s")) seconds } } diff --git a/docs/configuration.md b/docs/configuration.md index 1fd8b59ff8161..d2878191bc238 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -963,8 +963,9 @@ Apart from these, the following properties are also available, and may be useful
spark.core.connection.ack.wait.timeout
, spark.akka.timeout
,
- spark.storage.blockManagerSlaveTimeoutMs
or
- spark.shuffle.io.connectionTimeout
, if they are not configured.
+ spark.storage.blockManagerSlaveTimeoutMs
,
+ spark.shuffle.io.connectionTimeout
, spark.rpc.askTimeout
or
+ spark.rpc.lookupTimeout
if they are not configured.