diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2013-06-04 18:50:15 -0400 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2013-06-04 19:02:44 -0400 |
| commit | 061fd3ae369e744f076e21044de26a00982a408f (patch) | |
| tree | 5fecebdd07532c517c9fae5b598352f846235fe7 /core | |
| parent | 8bd4e1210422d9985e6105fd9529e813fe45c14e (diff) | |
| download | spark-061fd3ae369e744f076e21044de26a00982a408f.tar.gz spark-061fd3ae369e744f076e21044de26a00982a408f.tar.bz2 spark-061fd3ae369e744f076e21044de26a00982a408f.zip | |
Fixing bug in BlockManager timeout
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/spark/storage/BlockManager.scala | 2 | ||||
| -rw-r--r-- | core/src/main/scala/spark/storage/BlockManagerMasterActor.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 150c98f57c..65c789ea8f 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", "60000").toLong + System.getProperty("spark.storage.blockManagerTimeoutIntervalMs", "60000").toLong / 4 def getDisableHeartBeatsForTesting: Boolean = System.getProperty("spark.test.disableBlockManagerHeartBeat", "false").toBoolean diff --git a/core/src/main/scala/spark/storage/BlockManagerMasterActor.scala b/core/src/main/scala/spark/storage/BlockManagerMasterActor.scala index 9b64f95df8..0dcb9fb2ac 100644 --- a/core/src/main/scala/spark/storage/BlockManagerMasterActor.scala +++ b/core/src/main/scala/spark/storage/BlockManagerMasterActor.scala @@ -35,7 +35,7 @@ class BlockManagerMasterActor(val isLocal: Boolean) extends Actor with Logging { "" + (BlockManager.getHeartBeatFrequencyFromSystemProperties * 3)).toLong val checkTimeoutInterval = System.getProperty("spark.storage.blockManagerTimeoutIntervalMs", - "5000").toLong + "60000").toLong var timeoutCheckingTask: Cancellable = null |