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
Closed

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

Changes from 1 commit
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
Next Next commit
change to use shuffleDriverComponents.removeShuffle
  • Loading branch information
@bozhang2820
bozhang2820 committed Apr 30, 2024
commit 596c03905a07dabbe9000ff7f06017690fc23389
4 changes: 3 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 @@ -176,7 +176,9 @@ object SQLExecution extends Logging {
shuffleIds.foreach { shuffleId =>
queryExecution.shuffleCleanupMode match {
case RemoveShuffleFiles =>
SparkEnv.get.shuffleManager.unregisterShuffle(shuffleId)
// Do not unregister the shuffle on MapOutputTracker here to trigger stage retry.
// Otherwise, downstream tasks will fail with MetadataFetchFailedException.
sc.shuffleDriverComponents.removeShuffle(shuffleId, false)
case SkipMigration =>
SparkEnv.get.blockManager.migratableResolver.addShuffleToSkip(shuffleId)
case _ => // this should not happen
Expand Down