Yicong-Huang opened a new pull request, #58792:
URL: https://github.com/apache/spark/pull/58792
### What changes were proposed in this pull request?
Follow-up to #58288 (SPARK-59005). That PR added a prompt to correct the
JIRA Affects Version/s when they sit above the fix version, but only wired the
check into the fresh-resolve path and the backport path that adds a new fix
version. When the merge script is re-run on an already-resolved issue whose fix
versions are already complete, `resolve_jira_issue` returns early ("already
contains all inferred fix versions") before the Affects Version check runs, so
an inconsistent Affects Version is never flagged. This factors the gate into a
small `maybe_reconcile_jira_affects_versions` helper and calls it on every
resolve path, including the early-return paths that add no fix version.
### Why are the changes needed?
Without this, an already-resolved JIRA whose Affects Version sits above its
Fix Version (e.g. Affects `5.0.0`, Fix `4.4.0`) never triggers the correction
prompt on a re-run, which is exactly the common case the original PR aimed to
catch.
### Does this PR introduce _any_ user-facing change?
No. This only affects the committer-facing `dev/merge_spark_pr.py` tooling.
### How was this patch tested?
Existing doctests pass. Manually dry-ran `resolve_jira_issue` against an
already-resolved issue (Affects `5.0.0` / Fix `4.4.0`): before this change it
printed "already contains all inferred fix versions; no update needed" and
returned; after, it prompts for the corrected Affects Version(s) and (in
dry-run) logs the intended update.
### Was this patch authored or co-authored using generative AI tooling?
No.
This pull request and its description were written by Isaac.
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
