mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-31 23:37:01 +00:00
Merge pull request #120428 from pohly/dra-scheduler-reallocation-flake
DRA: scheduler reallocation flake
This commit is contained in:
commit
6c578bc982
@ -42,6 +42,7 @@ import (
|
|||||||
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature"
|
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/feature"
|
||||||
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/names"
|
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/names"
|
||||||
schedutil "k8s.io/kubernetes/pkg/scheduler/util"
|
schedutil "k8s.io/kubernetes/pkg/scheduler/util"
|
||||||
|
"k8s.io/utils/ptr"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@ -762,6 +763,19 @@ func (pl *dynamicResources) PostFilter(ctx context.Context, cs *framework.CycleS
|
|||||||
claim := state.claims[index]
|
claim := state.claims[index]
|
||||||
if len(claim.Status.ReservedFor) == 0 ||
|
if len(claim.Status.ReservedFor) == 0 ||
|
||||||
len(claim.Status.ReservedFor) == 1 && claim.Status.ReservedFor[0].UID == pod.UID {
|
len(claim.Status.ReservedFor) == 1 && claim.Status.ReservedFor[0].UID == pod.UID {
|
||||||
|
// Before we tell a driver to deallocate a claim, we
|
||||||
|
// have to stop telling it to allocate. Otherwise,
|
||||||
|
// depending on timing, it will deallocate the claim,
|
||||||
|
// see a PodSchedulingContext with selected node, and
|
||||||
|
// allocate again for that same node.
|
||||||
|
if state.podSchedulingState.schedulingCtx != nil &&
|
||||||
|
state.podSchedulingState.schedulingCtx.Spec.SelectedNode != "" {
|
||||||
|
state.podSchedulingState.selectedNode = ptr.To("")
|
||||||
|
if err := state.podSchedulingState.publish(ctx, pod, pl.clientset); err != nil {
|
||||||
|
return nil, statusError(logger, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
claim := state.claims[index].DeepCopy()
|
claim := state.claims[index].DeepCopy()
|
||||||
claim.Status.DeallocationRequested = true
|
claim.Status.DeallocationRequested = true
|
||||||
claim.Status.ReservedFor = nil
|
claim.Status.ReservedFor = nil
|
||||||
|
Loading…
Reference in New Issue
Block a user