From b539b0e98ceb2410b2c4524ffec8719041acea5d Mon Sep 17 00:00:00 2001 From: Reynold Xin Date: Tue, 30 Sep 2014 12:24:58 -0700 Subject: [PATCH] [SPARK-3709] Executors don't always report broadcast block removal properly back to the driver (for branch-1.1) Author: Reynold Xin 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 --- .../org/apache/spark/storage/BlockManagerSlaveActor.scala | 4 ++-- 1 file 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 6d4db064dff58..d3dd3a4d00fc0 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, _) =>