holdenk commented on a change in pull request #31493:
URL: https://github.com/apache/spark/pull/31493#discussion_r572244065
##########
File path: core/src/test/scala/org/apache/spark/storage/BlockManagerSuite.scala
##########
@@ -1932,22 +1932,29 @@ class BlockManagerSuite extends SparkFunSuite with
Matchers with BeforeAndAfterE
assert(master.getLocations(blockIdLarge) === Seq(store1.blockManagerId))
}
- test("test migration of shuffle blocks during decommissioning") {
- val shuffleManager1 = makeSortShuffleManager()
+ private def testShuffleBlockDecommissioning(maxShuffle: Option[Int],
migrate: Boolean) = {
Review comment:
Sure
##########
File path: core/src/test/scala/org/apache/spark/storage/BlockManagerSuite.scala
##########
@@ -1961,20 +1968,37 @@ class BlockManagerSuite extends SparkFunSuite with
Matchers with BeforeAndAfterE
decomManager.refreshOffloadingShuffleBlocks()
- eventually(timeout(1.second), interval(10.milliseconds)) {
- assert(mapOutputTracker.shuffleStatuses(0).mapStatuses(0).location ===
bm2.blockManagerId)
+ if (migrate) {
+ eventually(timeout(1.second), interval(10.milliseconds)) {
+ assert(mapOutputTracker.shuffleStatuses(0).mapStatuses(0).location
=== bm2.blockManagerId)
+ }
+
assert(Files.readAllBytes(bm2.diskBlockManager.getFile(shuffleData).toPath())
+ === shuffleDataBlockContent)
+
assert(Files.readAllBytes(bm2.diskBlockManager.getFile(shuffleIndex).toPath())
+ === shuffleIndexBlockContent)
+ } else {
+ Thread.sleep(1000)
+ assert(mapOutputTracker.shuffleStatuses(0).mapStatuses(0).location ===
bm1.blockManagerId)
}
-
assert(Files.readAllBytes(bm2.diskBlockManager.getFile(shuffleData).toPath())
- === shuffleDataBlockContent)
-
assert(Files.readAllBytes(bm2.diskBlockManager.getFile(shuffleIndex).toPath())
- === shuffleIndexBlockContent)
} finally {
mapOutputTracker.unregisterShuffle(0)
// Avoid thread leak
decomManager.stopOffloadingShuffleBlocks()
}
}
+ test("test migration of shuffle blocks during decommissioning - no limit") {
+ testShuffleBlockDecommissioning(None, true)
+ }
+
+ test("test migration of shuffle blocks during decommissioning - larger
limit") {
+ testShuffleBlockDecommissioning(Some(10000), true)
+ }
+
+ test("test migration of shuffle blocks during decommissioning - small
limit") {
Review comment:
yeah good idea :)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
