Merge pull request kubernetes#126644 from Huang-Wei/fix-preemption

k8s-ci-robot · web-flow · commit 03e81540633e · 2024-08-13T22:12:09.000-07:00
Fix a scheduler preemption issue where the victim isn't properly patched, leading to preemption not functioning as expected
diff --git a/pkg/scheduler/framework/preemption/preemption.go b/pkg/scheduler/framework/preemption/preemption.go
@@ -368,7 +368,7 @@ func (ev *Evaluator) prepareCandidate(ctx context.Context, c Candidate, pod *v1.
 				Reason:  v1.PodReasonPreemptionByScheduler,
 				Message: fmt.Sprintf("%s: preempting to accommodate a higher priority pod", pod.Spec.SchedulerName),
 			}
-			newStatus := pod.Status.DeepCopy()
+			newStatus := victim.Status.DeepCopy()
 			updated := apipod.UpdatePodCondition(newStatus, condition)
 			if updated {
 				if err := util.PatchPodStatus(ctx, cs, victim, newStatus); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ func (ev Evaluator) prepareCandidate(ctx context.Context, c Candidate, pod v1.`
`368`	`368`	`Reason: v1.PodReasonPreemptionByScheduler,`
`369`	`369`	`Message: fmt.Sprintf("%s: preempting to accommodate a higher priority pod", pod.Spec.SchedulerName),`
`370`	`370`	`}`
`371`		`- newStatus := pod.Status.DeepCopy()`
	`371`	`+ newStatus := victim.Status.DeepCopy()`
`372`	`372`	`updated := apipod.UpdatePodCondition(newStatus, condition)`
`373`	`373`	`if updated {`
`374`	`374`	`if err := util.PatchPodStatus(ctx, cs, victim, newStatus); err != nil {`