File tree Expand file tree Collapse file tree 2 files changed +1
-5
lines changed
main/scala/org/apache/spark/storage
test/scala/org/apache/spark/storage Expand file tree Collapse file tree 2 files changed +1
-5
lines changed Original file line number Diff line number Diff line change @@ -48,7 +48,6 @@ private[storage] class BlockManagerDecommissioner(
4848 @ volatile private var rddBlocksLeft : Boolean = true
4949 @ volatile private var shuffleBlocksLeft : Boolean = true
5050
51-
5251 /**
5352 * This runnable consumes any shuffle blocks in the queue for migration. This part of a
5453 * producer/consumer where the main migration loop updates the queue of blocks to be migrated
@@ -129,8 +128,6 @@ private[storage] class BlockManagerDecommissioner(
129128 // if a new shuffle file is created by a running task.
130129 private val numMigratedShuffles = new AtomicInteger (0 )
131130
132-
133-
134131 // Shuffles which are queued for migration & number of retries so far.
135132 // Visible in storage for testing.
136133 private [storage] val shufflesToMigrate =
@@ -369,7 +366,7 @@ private[storage] class BlockManagerDecommissioner(
369366 if (stopped || (stoppedRDD && stoppedShuffle)) {
370367 (System .nanoTime(), true )
371368 } else {
372-
369+ // Chose the min of the running times.
373370 val lastMigrationTime = if (
374371 conf.get(config.STORAGE_DECOMMISSION_SHUFFLE_BLOCKS_ENABLED ) &&
375372 conf.get(config.STORAGE_DECOMMISSION_RDD_BLOCKS_ENABLED )) {
Original file line number Diff line number Diff line change @@ -92,7 +92,6 @@ class BlockManagerDecommissionUnitSuite extends SparkFunSuite with Matchers {
9292 } finally {
9393 bmDecomManager.stop()
9494 }
95-
9695 bmDecomManager.stop()
9796 }
9897}
You can’t perform that action at this time.
0 commit comments