diff options
| author | Sean Owen <sowen@cloudera.com> | 2016-11-19 11:28:25 +0000 |
|---|---|---|
| committer | Sean Owen <sowen@cloudera.com> | 2016-11-19 11:28:25 +0000 |
| commit | 8b1e1088eb274fb15260cd5d6d9508d42837a4d6 (patch) | |
| tree | 63ca554047d9ad3bcf12dac9b23d613a9663fda0 /core | |
| parent | d5b1d5fc80153571c308130833d0c0774de62c92 (diff) | |
| download | spark-8b1e1088eb274fb15260cd5d6d9508d42837a4d6.tar.gz spark-8b1e1088eb274fb15260cd5d6d9508d42837a4d6.tar.bz2 spark-8b1e1088eb274fb15260cd5d6d9508d42837a4d6.zip | |
[SPARK-18353][CORE] spark.rpc.askTimeout defalut value is not 120s
## What changes were proposed in this pull request?
Avoid hard-coding spark.rpc.askTimeout to non-default in Client; fix doc about spark.rpc.askTimeout default
## How was this patch tested?
Existing tests
Author: Sean Owen <sowen@cloudera.com>
Closes #15833 from srowen/SPARK-18353.
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/deploy/Client.scala | 4 |
1 files changed, 3 insertions, 1 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 = |