diff options
author | Reynold Xin <rxin@apache.org> | 2014-09-30 12:24:58 -0700 |
---|---|---|
committer | Reynold Xin <rxin@apache.org> | 2014-09-30 12:24:58 -0700 |
commit | a8c6e82de31cb09b7e7e37caf4e52c9e10185b63 (patch) | |
tree | 1cce7472761dcd7dfde87946a090cf1dd6a58c0a /core/src/main | |
parent | 48be6576c33367741727521864ba1dbdca288d9d (diff) | |
download | spark-a8c6e82de31cb09b7e7e37caf4e52c9e10185b63.tar.gz spark-a8c6e82de31cb09b7e7e37caf4e52c9e10185b63.tar.bz2 spark-a8c6e82de31cb09b7e7e37caf4e52c9e10185b63.zip |
[SPARK-3709] Executors don't always report broadcast block removal properly back to the driver (for branch-1.1)
Author: Reynold Xin <rxin@apache.org>
Closes #2591 from rxin/SPARK-3709-1.1 and squashes the following commits:
ab99cc0 [Reynold Xin] [SPARK-3709] Executors don't always report broadcast block removal properly back to the driver
Diffstat (limited to 'core/src/main')
-rw-r--r-- | core/src/main/scala/org/apache/spark/storage/BlockManagerSlaveActor.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/main/scala/org/apache/spark/storage/BlockManagerSlaveActor.scala b/core/src/main/scala/org/apache/spark/storage/BlockManagerSlaveActor.scala index c194e0fed3..4e7412a47d 100644 --- a/core/src/main/scala/org/apache/spark/storage/BlockManagerSlaveActor.scala +++ b/core/src/main/scala/org/apache/spark/storage/BlockManagerSlaveActor.scala @@ -58,9 +58,9 @@ class BlockManagerSlaveActor( blockManager.shuffleBlockManager.removeShuffle(shuffleId) } - case RemoveBroadcast(broadcastId, tellMaster) => + case RemoveBroadcast(broadcastId, _) => doAsync[Int]("removing broadcast " + broadcastId, sender) { - blockManager.removeBroadcast(broadcastId, tellMaster) + blockManager.removeBroadcast(broadcastId, tellMaster = true) } case GetBlockStatus(blockId, _) => |