Skip to content

[release-1.14] fix(scheduler): correct NominatedNodeName lifecycle and preempt eligibility #6087

Closed

Description

@volcano-sh-bot

Manual cherrypick required.

#6066 failed to apply on top of branch "release-1.14":

Applying: Fix preempt task eligibility
Using index info to reconstruct a base tree...
M	pkg/scheduler/actions/preempt/preempt.go
M	pkg/scheduler/actions/preempt/preempt_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/scheduler/actions/preempt/preempt_test.go
CONFLICT (content): Merge conflict in pkg/scheduler/actions/preempt/preempt_test.go
Auto-merging pkg/scheduler/actions/preempt/preempt.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix preempt task eligibility
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Metadata

Metadata

Labels

No labels
No labels

Type

No type

Projects

No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions