Fixed bug and adding unit test for removeBroadcast in BlockManagerSuite.

tdas · tdas · commit 6222697f41a6 · 2014-04-04T10:10:59.000-07:00
diff --git a/core/src/main/scala/org/apache/spark/storage/ShuffleBlockManager.scala b/core/src/main/scala/org/apache/spark/storage/ShuffleBlockManager.scala
@@ -170,9 +170,9 @@ class ShuffleBlockManager(blockManager: BlockManager) extends Logging {
   }
 
   /** Remove all the blocks / files and metadata related to a particular shuffle. */
-  def removeShuffle(shuffleId: ShuffleId) {
-    removeShuffleBlocks(shuffleId)
+  def removeShuffle(shuffleId: ShuffleId): Boolean = {
     shuffleStates.remove(shuffleId)
+    removeShuffleBlocks(shuffleId)
   }
 
   /** Remove all the blocks / files related to a particular shuffle. */

Original file line number	Diff line number	Diff line change
`@@ -170,9 +170,9 @@ class ShuffleBlockManager(blockManager: BlockManager) extends Logging {`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`/** Remove all the blocks / files and metadata related to a particular shuffle. */`
`173`		`- def removeShuffle(shuffleId: ShuffleId) {`
`174`		`- removeShuffleBlocks(shuffleId)`
	`173`	`+ def removeShuffle(shuffleId: ShuffleId): Boolean = {`
`175`	`174`	`shuffleStates.remove(shuffleId)`
	`175`	`+ removeShuffleBlocks(shuffleId)`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`/** Remove all the blocks / files related to a particular shuffle. */`