[BLAZE-1071][FOLLOWUP] Fix incorrect mapStatus to prevent Uniffle failures in Blaze#1072
Merged
richox merged 2 commits intoapache:masterfrom Jul 29, 2025
Merged
Conversation
…ent StackOverflowError
Member
Author
richox
approved these changes
Jul 29, 2025
Member
|
Sorry for the late review. LTGM |
cxzl25
reviewed
Aug 8, 2025
| } | ||
|
|
||
| override def rssStop(success: Boolean): Unit = { | ||
| override def rssStop(success: Boolean): Option[MapStatus] = { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Which issue does this PR close?
This is the followup of #901 and #979
Closes #1071
Rationale for this change
When using Uniffle as the shuffle service in Blaze, the constructed MapStatus in BlazeRssShuffleWriterBase may lack the required topologyInfo in its BlockManagerId.
This causes Uniffle to throw an error during shuffle read:
The root cause is that although Uniffle internally builds a MapStatus with proper BlockManagerId (including topologyInfo), this status is not propagated or reused by Blaze. Instead, Blaze re-constructs a new MapStatus using SparkEnv.get.blockManager.shuffleServerId, which lacks the correct topologyInfo.
This PR ensures that the correct MapStatus (with valid topologyInfo) returned by Uniffle’s shuffle writer is preserved and returned to the shuffle system, avoiding this mismatch and runtime failure.
What changes are included in this PR?
Update BlazeRssShuffleWriterBase.stop() to prefer the MapStatus returned by the underlying RSS shuffle writer (e.g., Uniffle).
Fallback to the original construction logic only if no MapStatus is returned.
Are there any user-facing changes?
No.