From 25a6736d545ed4e971cc7ed54fe5d01de2862716 Mon Sep 17 00:00:00 2001
From: zsxwing <zsxwing@gmail.com>
Date: Wed, 22 Apr 2015 08:27:36 +0800
Subject: [PATCH] Increase the default timeout to 120s

---
 core/src/main/scala/org/apache/spark/util/RpcUtils.scala | 4 ++--
 docs/configuration.md                                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

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 5ccb0aa7f0736..f16cc8e7e42c6 100644
--- a/core/src/main/scala/org/apache/spark/util/RpcUtils.scala
+++ b/core/src/main/scala/org/apache/spark/util/RpcUtils.scala
@@ -49,12 +49,12 @@ object RpcUtils {
   /** Returns the default Spark timeout to use for RPC ask operations. */
   def askTimeout(conf: SparkConf): FiniteDuration = {
     conf.getTimeAsSeconds("spark.rpc.askTimeout",
-      conf.get("spark.network.timeout", "30s")) seconds
+      conf.get("spark.network.timeout", "120s")) seconds
   }
 
   /** Returns the default Spark timeout to use for RPC remote endpoint lookup. */
   def lookupTimeout(conf: SparkConf): FiniteDuration = {
     conf.getTimeAsSeconds("spark.rpc.lookupTimeout",
-      conf.get("spark.network.timeout", "30s")) seconds
+      conf.get("spark.network.timeout", "120s")) seconds
   }
 }
diff --git a/docs/configuration.md b/docs/configuration.md
index af08b0727e986..d587b91124cb8 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -1000,14 +1000,14 @@ Apart from these, the following properties are also available, and may be useful
 </tr>
 <tr>
   <td><code>spark.rpc.askTimeout</code></td>
-  <td>30s</td>
+  <td>120s</td>
   <td>
     Duration for an RPC ask operation to wait before timing out.
   </td>
 </tr>
 <tr>
   <td><code>spark.rpc.lookupTimeout</code></td>
-  <td>30s</td>
+  <td>120s</td>
     Duration for an RPC remote endpoint lookup operation to wait before timing out.
   <td>
   </td>