Fix queue update conflicts when upgrading to new version #4336
Conversation
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
Signed-off-by: Monokaix <[email protected]>
volcano-sh-bot
added
the
size/S
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: lowang-bh The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
volcano-sh-bot
added
the
approved
|
/lgtm |
|
@Monokaix Please also cherry-pick it to release-1.11 |
dongjoon-hyun
added a commit
to apache/spark
that referenced
this pull request
Jul 1, 2025
### What changes were proposed in this pull request? This PR aims to upgrade `Volcano` to 1.12.1 in K8s integration test document and GA job. ### Why are the changes needed? To bring the latest improvements and security fixes. - https://github.com/volcano-sh/volcano/releases/tag/v1.12.1 - volcano-sh/volcano#4336 - https://github.com/volcano-sh/volcano/releases/tag/v1.12.0 - volcano-sh/volcano#4099 - volcano-sh/volcano#3799 - volcano-sh/volcano#4207 - GHSA-hg79-fw4p-25p8 ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Pass GA. ### Was this patch authored or co-authored using generative AI tooling? No. Closes #51343 from dongjoon-hyun/SPARK-52639. Authored-by: Dongjoon Hyun <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
volcano-sh-bot
added a commit
that referenced
this pull request
Jul 13, 2025
…4336-origin-release-1.11 Automated cherry pick of #4336: Fix queue update conflicts when upgrading to new version
asl3
pushed a commit
to asl3/spark
that referenced
this pull request
Jul 14, 2025
### What changes were proposed in this pull request? This PR aims to upgrade `Volcano` to 1.12.1 in K8s integration test document and GA job. ### Why are the changes needed? To bring the latest improvements and security fixes. - https://github.com/volcano-sh/volcano/releases/tag/v1.12.1 - volcano-sh/volcano#4336 - https://github.com/volcano-sh/volcano/releases/tag/v1.12.0 - volcano-sh/volcano#4099 - volcano-sh/volcano#3799 - volcano-sh/volcano#4207 - GHSA-hg79-fw4p-25p8 ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Pass GA. ### Was this patch authored or co-authored using generative AI tooling? No. Closes apache#51343 from dongjoon-hyun/SPARK-52639. Authored-by: Dongjoon Hyun <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
haoyangeng-db
pushed a commit
to haoyangeng-db/apache-spark
that referenced
this pull request
Jul 22, 2025
### What changes were proposed in this pull request? This PR aims to upgrade `Volcano` to 1.12.1 in K8s integration test document and GA job. ### Why are the changes needed? To bring the latest improvements and security fixes. - https://github.com/volcano-sh/volcano/releases/tag/v1.12.1 - volcano-sh/volcano#4336 - https://github.com/volcano-sh/volcano/releases/tag/v1.12.0 - volcano-sh/volcano#4099 - volcano-sh/volcano#3799 - volcano-sh/volcano#4207 - GHSA-hg79-fw4p-25p8 ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Pass GA. ### Was this patch authored or co-authored using generative AI tooling? No. Closes apache#51343 from dongjoon-hyun/SPARK-52639. Authored-by: Dongjoon Hyun <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 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.
What type of PR is this?
/kind bug
What this PR does / why we need it:
In version before v1.12, queue update use applustatus of SSA and controller manage both queue.status.state and queue.status.allocated, and scheduler will also update queue.status.allocated, so there will be a conflict when scheduler update queue using applystatus, this pr force update queu.status.allocated to solve this issue.
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Does this PR introduce a user-facing change?