diff options
| author | Mosharaf Chowdhury <mosharaf@cs.berkeley.edu> | 2013-10-14 09:40:51 -0700 |
|---|---|---|
| committer | Mosharaf Chowdhury <mosharaf@cs.berkeley.edu> | 2013-10-16 21:33:33 -0700 |
| commit | 6e5a60fab46daf5525749d9e71f1ccfaffddd34d (patch) | |
| tree | 256d0626c0197659dee0defae6d63b9b7a16d373 | |
| parent | 4602e2bf6e2ae9202d71b4e28222a0b525380e7e (diff) | |
| download | spark-6e5a60fab46daf5525749d9e71f1ccfaffddd34d.tar.gz spark-6e5a60fab46daf5525749d9e71f1ccfaffddd34d.tar.bz2 spark-6e5a60fab46daf5525749d9e71f1ccfaffddd34d.zip | |
Removed unnecessary code, and added comment of memory-latency tradeoff.
| -rw-r--r-- | core/src/main/scala/org/apache/spark/broadcast/TorrentBroadcast.scala | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/src/main/scala/org/apache/spark/broadcast/TorrentBroadcast.scala b/core/src/main/scala/org/apache/spark/broadcast/TorrentBroadcast.scala index ad1d29a79a..29e0dd26d4 100644 --- a/core/src/main/scala/org/apache/spark/broadcast/TorrentBroadcast.scala +++ b/core/src/main/scala/org/apache/spark/broadcast/TorrentBroadcast.scala @@ -89,7 +89,12 @@ extends Broadcast[T](id) with Logging with Serializable { if (receiveBroadcast(id)) { value_ = TorrentBroadcast.unBlockifyObject[T](arrayOfBlocks, totalBytes, totalBlocks) - SparkEnv.get.blockManager.putSingle(broadcastId, value_, StorageLevel.MEMORY_AND_DISK, false) + + // Store the merged copy in cache so that the next worker doesn't need to rebuild it. + // This creates a tradeoff between memory usage and latency. + // Storing copy doubles the memory footprint; not storing doubles deserialization cost. + SparkEnv.get.blockManager.putSingle( + broadcastId, value_, StorageLevel.MEMORY_AND_DISK, false) // Remove arrayOfBlocks from memory once value_ is on local cache resetWorkerVariables() @@ -111,9 +116,6 @@ extends Broadcast[T](id) with Logging with Serializable { } def receiveBroadcast(variableID: Long): Boolean = { - if (totalBlocks > 0 && totalBlocks == hasBlocks) - return true - // Receive meta-info val metaId = broadcastId + "_meta" var attemptId = 10 |