Skip to content

[SPARK-47764][FOLLOW-UP] Change to use ShuffleDriverComponents.removeShuffle to remove shuffle properly #46302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bozhang2820 wants to merge 7 commits into from
+5 −2
Closed

[SPARK-47764][FOLLOW-UP] Change to use ShuffleDriverComponents.removeShuffle to remove shuffle properly #46302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
596c039
change to use shuffleDriverComponents.removeShuffle
bozhang2820 Apr 30, 2024
3edca8e
Fix cleanup in test
bozhang2820 May 24, 2024
0b3d79e
Cleanup based on isLocal
bozhang2820 May 24, 2024
6c135d6
Trigger CI
bozhang2820 Jun 4, 2024
c6ff003
remove if isLocal
bozhang2820 Jul 23, 2024
886a992
Merge remote-tracking branch 'apache/master' into spark-47764-1
bozhang2820 Jul 24, 2024
6fe25d3
Update comments
bozhang2820 Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/execution/SQLExecution.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,10 @@ object SQLExecution extends Logging {
shuffleIds.foreach { shuffleId =>
queryExecution.shuffleCleanupMode match {
case RemoveShuffleFiles =>
SparkEnv.get.shuffleManager.unregisterShuffle(shuffleId)
// Same as what we do in ContextCleaner.doCleanupShuffle, but do not unregister
// the shuffle on MapOutputTracker, so that stage retries would be triggered.
// Set blocking to Utils.isTesting to deflake unit tests.
sc.shuffleDriverComponents.removeShuffle(shuffleId, Utils.isTesting)
Copy link
Contributor

@cloud-fan cloud-fan Jul 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This cleanup is not critical, I think the second parameter blocking can always be false

Copy link
Contributor Author

@bozhang2820 bozhang2820 Jul 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The unit tests would be flaky if we use false here.

Copy link
Contributor

@cloud-fan cloud-fan Jul 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh I see, can we add some comments to explain it?

Copy link
Contributor Author

@bozhang2820 bozhang2820 Jul 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. Done.

case SkipMigration =>
SparkEnv.get.blockManager.migratableResolver.addShuffleToSkip(shuffleId)
case _ => // this should not happen
Expand Down
2 changes: 1 addition & 1 deletion sql/core/src/test/scala/org/apache/spark/sql/execution/QueryExecutionSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ class QueryExecutionSuite extends SharedSparkSession {
val blockManager = spark.sparkContext.env.blockManager
blockManager.diskBlockManager.getAllBlocks().foreach {
case ShuffleIndexBlockId(shuffleId, _, _) =>
spark.sparkContext.env.shuffleManager.unregisterShuffle(shuffleId)
spark.sparkContext.shuffleDriverComponents.removeShuffle(shuffleId, true)
case _ =>
}
}
Expand Down