diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-06-04 15:25:58 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-06-04 15:25:58 -0700 |
| commit | f420d4f228b76ba0b11a3a2f3c6abe716989e414 (patch) | |
| tree | df803aa1ca1d8037bcafead65a98387198abdb25 | |
| parent | 84530ba6d9fa47ee2863bb50c23742ecfa2a6a64 (diff) | |
| parent | 8bd4e1210422d9985e6105fd9529e813fe45c14e (diff) | |
| download | spark-f420d4f228b76ba0b11a3a2f3c6abe716989e414.tar.gz spark-f420d4f228b76ba0b11a3a2f3c6abe716989e414.tar.bz2 spark-f420d4f228b76ba0b11a3a2f3c6abe716989e414.zip | |
Merge pull request #639 from pwendell/timeout-update
Bump akka and blockmanager timeouts to 60 seconds
| -rw-r--r-- | core/src/main/scala/spark/storage/BlockManager.scala | 2 | ||||
| -rw-r--r-- | core/src/main/scala/spark/util/AkkaUtils.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/src/main/scala/spark/storage/BlockManager.scala b/core/src/main/scala/spark/storage/BlockManager.scala index 3a5d4ef448..2424b19fed 100644 --- a/core/src/main/scala/spark/storage/BlockManager.scala +++ b/core/src/main/scala/spark/storage/BlockManager.scala @@ -965,7 +965,7 @@ private[spark] object BlockManager extends Logging { } def getHeartBeatFrequencyFromSystemProperties: Long = - System.getProperty("spark.storage.blockManagerHeartBeatMs", "5000").toLong + System.getProperty("spark.storage.blockManagerHeartBeatMs", "60000").toLong def getDisableHeartBeatsForTesting: Boolean = System.getProperty("spark.test.disableBlockManagerHeartBeat", "false").toBoolean diff --git a/core/src/main/scala/spark/util/AkkaUtils.scala b/core/src/main/scala/spark/util/AkkaUtils.scala index cd79bd2bda..e93cc3b485 100644 --- a/core/src/main/scala/spark/util/AkkaUtils.scala +++ b/core/src/main/scala/spark/util/AkkaUtils.scala @@ -29,7 +29,7 @@ private[spark] object AkkaUtils { def createActorSystem(name: String, host: String, port: Int): (ActorSystem, Int) = { val akkaThreads = System.getProperty("spark.akka.threads", "4").toInt val akkaBatchSize = System.getProperty("spark.akka.batchSize", "15").toInt - val akkaTimeout = System.getProperty("spark.akka.timeout", "20").toInt + val akkaTimeout = System.getProperty("spark.akka.timeout", "60").toInt val akkaFrameSize = System.getProperty("spark.akka.frameSize", "10").toInt val lifecycleEvents = if (System.getProperty("spark.akka.logLifecycleEvents", "false").toBoolean) "on" else "off" // 10 seconds is the default akka timeout, but in a cluster, we need higher by default. |