github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

return skip

Browse Source
This commit is contained in:
kidddddddddddddddddddddd 2023-01-07 21:58:54 +08:00
parent ca5c522080
commit 059d520537
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/scheduler/framework/plugins/volumebinding/volume_binding.go
View File

@ -47,7 +47,6 @@ const (
// framework.CycleState, in the later phases we don't need to call Write method // framework.CycleState, in the later phases we don't need to call Write method
// to update the value // to update the value
type stateData struct { type stateData struct {
skip bool // set true if pod does not have PVCs
allBound bool allBound bool
// podVolumesByNode holds the pod's volume information found in the Filter // podVolumesByNode holds the pod's volume information found in the Filter
// phase for each node // phase for each node
@ -166,8 +165,7 @@ func (pl *VolumeBinding) PreFilter(ctx context.Context, state *framework.CycleSt
if hasPVC, err := pl.podHasPVCs(pod); err != nil { if hasPVC, err := pl.podHasPVCs(pod); err != nil {
return nil, framework.NewStatus(framework.UnschedulableAndUnresolvable, err.Error()) return nil, framework.NewStatus(framework.UnschedulableAndUnresolvable, err.Error())
} else if !hasPVC { } else if !hasPVC {
state.Write(stateKey, &stateData{skip: true}) return nil, framework.NewStatus(framework.Skip)
return nil, nil
} }
podVolumeClaims, err := pl.Binder.GetPodVolumeClaims(pod) podVolumeClaims, err := pl.Binder.GetPodVolumeClaims(pod)
if err != nil { if err != nil {
@ -243,10 +241,6 @@ func (pl *VolumeBinding) Filter(ctx context.Context, cs *framework.CycleState, p
return framework.AsStatus(err) return framework.AsStatus(err)
} }
if state.skip {
return nil
}
podVolumes, reasons, err := pl.Binder.FindPodVolumes(pod, state.podVolumeClaims, node) podVolumes, reasons, err := pl.Binder.FindPodVolumes(pod, state.podVolumeClaims, node)
if err != nil { if err != nil {

4
pkg/scheduler/framework/plugins/volumebinding/volume_binding_test.go
View File

@ -92,9 +92,7 @@ func TestVolumeBinding(t *testing.T) {
nodes: []*v1.Node{ nodes: []*v1.Node{
makeNode("node-a").Node, makeNode("node-a").Node,
}, },
wantStateAfterPreFilter: &stateData{ wantPreFilterStatus: framework.NewStatus(framework.Skip),
skip: true,
},
wantFilterStatus: []*framework.Status{ wantFilterStatus: []*framework.Status{
nil, nil,
}, },