diff options
| -rw-r--r-- | core/src/main/scala/org/apache/spark/deploy/Client.scala | 4 | ||||
| -rw-r--r-- | docs/configuration.md | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/core/src/main/scala/org/apache/spark/deploy/Client.scala b/core/src/main/scala/org/apache/spark/deploy/Client.scala index ee276e1b71..a4de3d7eaf 100644 --- a/core/src/main/scala/org/apache/spark/deploy/Client.scala +++ b/core/src/main/scala/org/apache/spark/deploy/Client.scala @@ -221,7 +221,9 @@ object Client { val conf = new SparkConf() val driverArgs = new ClientArguments(args) - conf.set("spark.rpc.askTimeout", "10") + if (!conf.contains("spark.rpc.askTimeout")) { + conf.set("spark.rpc.askTimeout", "10s") + } Logger.getRootLogger.setLevel(driverArgs.logLevel) val rpcEnv = diff --git a/docs/configuration.md b/docs/configuration.md index c021a377ba..a3b4ff01e6 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -1184,7 +1184,7 @@ Apart from these, the following properties are also available, and may be useful </tr> <tr> <td><code>spark.rpc.askTimeout</code></td> - <td>120s</td> + <td><code>spark.network.timeout</code></td> <td> Duration for an RPC ask operation to wait before timing out. </td> @@ -1566,7 +1566,7 @@ Apart from these, the following properties are also available, and may be useful </tr> <tr> <td><code>spark.core.connection.ack.wait.timeout</code></td> - <td>60s</td> + <td><code>spark.network.timeout</code></td> <td> How long 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, |