Repository: spark Updated Branches: refs/heads/branch-1.0 4f991c9ff -> b539b0e98
[SPARK-3709] Executors don't always report broadcast block removal properly back to the driver (for branch-1.1) Author: Reynold Xin <[email protected]> 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 (cherry picked from commit a8c6e82de31cb09b7e7e37caf4e52c9e10185b63) Signed-off-by: Reynold Xin <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/b539b0e9 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/b539b0e9 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/b539b0e9 Branch: refs/heads/branch-1.0 Commit: b539b0e98ceb2410b2c4524ffec8719041acea5d Parents: 4f991c9 Author: Reynold Xin <[email protected]> Authored: Tue Sep 30 12:24:58 2014 -0700 Committer: Reynold Xin <[email protected]> Committed: Tue Sep 30 12:25:11 2014 -0700 ---------------------------------------------------------------------- .../scala/org/apache/spark/storage/BlockManagerSlaveActor.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/b539b0e9/core/src/main/scala/org/apache/spark/storage/BlockManagerSlaveActor.scala ---------------------------------------------------------------------- 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 6d4db06..d3dd3a4 100644 --- a/core/src/main/scala/org/apache/spark/storage/BlockManagerSlaveActor.scala +++ b/core/src/main/scala/org/apache/spark/storage/BlockManagerSlaveActor.scala @@ -57,9 +57,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, _) => --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
