aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/org/apache/spark/deploy/Client.scala4
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 =