[SPARK-58754][INFRA] Update JIRA fix versions for separately backported pull requests - #57981
Closed
zhengruifeng wants to merge 1 commit into
Closed
[SPARK-58754][INFRA] Update JIRA fix versions for separately backported pull requests#57981zhengruifeng wants to merge 1 commit into
zhengruifeng wants to merge 1 commit into
Conversation
HyukjinKwon
approved these changes
Aug 13, 2026
uros-b
approved these changes
Aug 13, 2026
uros-b
left a comment
Member
There was a problem hiding this comment.
Thank you @zhengruifeng and @HyukjinKwon!
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
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.
What changes were proposed in this pull request?
Update
dev/merge_spark_pr.pyso that JIRA handling is not skipped when a backport iscancelled after the original merge has already been pushed.
The script now also runs JIRA handling when an already-merged pull request is invoked again
in backport mode. If the associated issue is already resolved, the script preserves its
existing Fix Versions and offers to add only the versions inferred from newly discovered
backport branches.
Why are the changes needed?
The JIRA update previously ran after the optional cherry-pick loop. Cancelling a cherry-pick
exited through the loop's cleanup path and never reached the JIRA update. A later invocation
recognized the closed pull request as a backport, but that path also exited before JIRA
handling.
This happened with #57754: the first invocation merged into
masterand was cancelled whilestarting the
branch-4.xbackport. The second invocation completed that backport, but neitherinvocation updated SPARK-58556, so it had to be resolved manually with both Fix Versions.
Does this PR introduce any user-facing change?
No. This only changes the Spark committer merge tool.
How was this patch tested?
Added inline doctests for retaining existing Fix Versions while selecting only newly inferred
backport versions.
The following checks passed:
79 doctests passed.
Was this patch authored or co-authored using generative AI tooling?
Generated-by: Codex (GPT-5)