diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2013-06-04 18:14:24 -0400 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2013-06-04 18:14:24 -0400 |
| commit | 8bd4e1210422d9985e6105fd9529e813fe45c14e (patch) | |
| tree | 2bf79ea00a51472ee0538f856962efb64904e3d2 /core | |
| parent | 63e1999f6057bd397b49efe432ad74c0015a101b (diff) | |
| download | spark-8bd4e1210422d9985e6105fd9529e813fe45c14e.tar.gz spark-8bd4e1210422d9985e6105fd9529e813fe45c14e.tar.bz2 spark-8bd4e1210422d9985e6105fd9529e813fe45c14e.zip | |
Bump akka and blockmanager timeouts to 60 seconds
Diffstat (limited to 'core')
| -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 09572b19db..150c98f57c 100644 --- a/core/src/main/scala/spark/storage/BlockManager.scala +++ b/core/src/main/scala/spark/storage/BlockManager.scala @@ -950,7 +950,7 @@ 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 9fb7e001ba..def993236b 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. |