diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-06-04 16:09:50 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-06-04 16:09:50 -0700 |
| commit | fff3728552ccd2fc02fc4b7b750a9e3698869718 (patch) | |
| tree | 7b233846ff96c5ce1e5d05989496dd62ac4f7617 | |
| parent | f420d4f228b76ba0b11a3a2f3c6abe716989e414 (diff) | |
| parent | 061fd3ae369e744f076e21044de26a00982a408f (diff) | |
| download | spark-fff3728552ccd2fc02fc4b7b750a9e3698869718.tar.gz spark-fff3728552ccd2fc02fc4b7b750a9e3698869718.tar.bz2 spark-fff3728552ccd2fc02fc4b7b750a9e3698869718.zip | |
Merge pull request #640 from pwendell/timeout-update
Fixing bug in BlockManager timeout
| -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 2424b19fed..9b39d3aadf 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", "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 2d05e0ccf1..0d4384ba1f 100644 --- a/core/src/main/scala/spark/storage/BlockManagerMasterActor.scala +++ b/core/src/main/scala/spark/storage/BlockManagerMasterActor.scala @@ -39,7 +39,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 |