github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add pre_filter for volume_zone

Browse Source
This commit is contained in:
kidddddddddddddddddddddd
2022-11-26 15:58:02 +08:00
parent 5fd9a519a9
commit 9e0a7c7ee7
6 changed files with 336 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

188
pkg/scheduler/framework/plugins/volumezone/volume_zone_test.go
View File

@@ -18,14 +18,19 @@ package volumezone
import (
"context"
"reflect"
"fmt"
"testing"
"github.com/google/go-cmp/cmp"
v1 "k8s.io/api/core/v1"
storagev1 "k8s.io/api/storage/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/kubernetes/pkg/scheduler/apis/config"
"k8s.io/kubernetes/pkg/scheduler/framework"
fakeframework "k8s.io/kubernetes/pkg/scheduler/framework/fake"
plugintesting "k8s.io/kubernetes/pkg/scheduler/framework/plugins/testing"
"k8s.io/kubernetes/pkg/scheduler/internal/cache"
st "k8s.io/kubernetes/pkg/scheduler/testing"
)
@@ -50,6 +55,9 @@ func TestSingleZone(t *testing.T) {
{
ObjectMeta: metav1.ObjectMeta{Name: "Vol_Stable_2", Labels: map[string]string{v1.LabelTopologyRegion: "us-west1", "uselessLabel": "none"}},
},
{
ObjectMeta: metav1.ObjectMeta{Name: "Vol_Stable_3", Labels: map[string]string{v1.LabelTopologyZone: "us-west1-a", v1.LabelTopologyRegion: "us-west1-a"}},
},
}
pvcLister := fakeframework.PersistentVolumeClaimLister{
@@ -77,6 +85,10 @@ func TestSingleZone(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{Name: "PVC_Stable_2", Namespace: "default"},
Spec: v1.PersistentVolumeClaimSpec{VolumeName: "Vol_Stable_2"},
},
{
ObjectMeta: metav1.ObjectMeta{Name: "PVC_Stable_3", Namespace: "default"},
Spec: v1.PersistentVolumeClaimSpec{VolumeName: "Vol_Stable_3"},
},
}
tests := []struct {
@@ -188,10 +200,27 @@ func TestSingleZone(t *testing.T) {
},
wantStatus: framework.NewStatus(framework.UnschedulableAndUnresolvable, ErrReasonConflict),
},
{
name: "pv with zone and region, node with only zone",
Pod: createPodWithVolume("pod_1", "Vol_Stable_3", "PVC_Stable_3"),
Node: &v1.Node{
ObjectMeta: metav1.ObjectMeta{
Name: "host1",
Labels: map[string]string{
v1.LabelTopologyZone: "us-west1-a",
},
},
},
wantStatus: framework.NewStatus(framework.UnschedulableAndUnresolvable, ErrReasonConflict),
},
}
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
state := framework.NewCycleState()
node := &framework.NodeInfo{}
node.SetNode(test.Node)
p := &VolumeZone{
@@ -199,9 +228,17 @@ func TestSingleZone(t *testing.T) {
pvcLister,
nil,
}
gotStatus := p.Filter(context.Background(), nil, test.Pod, node)
if !reflect.DeepEqual(gotStatus, test.wantStatus) {
t.Errorf("status does not match: %v, want: %v", gotStatus, test.wantStatus)
_, gotPreFilterStatus := p.PreFilter(ctx, state, test.Pod)
if !gotPreFilterStatus.IsSuccess() {
if diff := cmp.Diff(gotPreFilterStatus, test.wantStatus); diff != "" {
t.Errorf("status does not match (-want,+got):\n%s", diff)
}
} else {
gotStatus := p.Filter(ctx, state, test.Pod, node)
if diff := cmp.Diff(gotStatus, test.wantStatus); diff != "" {
t.Errorf("status does not match (-want,+got):\n%s", diff)
}
}
})
}
@@ -314,6 +351,10 @@ func TestMultiZone(t *testing.T) {
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
state := framework.NewCycleState()
node := &framework.NodeInfo{}
node.SetNode(test.Node)
p := &VolumeZone{
@@ -321,9 +362,16 @@ func TestMultiZone(t *testing.T) {
pvcLister,
nil,
}
gotStatus := p.Filter(context.Background(), nil, test.Pod, node)
if !reflect.DeepEqual(gotStatus, test.wantStatus) {
t.Errorf("status does not match: %v, want: %v", gotStatus, test.wantStatus)
_, gotPreFilterStatus := p.PreFilter(ctx, state, test.Pod)
if !gotPreFilterStatus.IsSuccess() {
if diff := cmp.Diff(gotPreFilterStatus, test.wantStatus); diff != "" {
t.Errorf("status does not match (-want,+got):\n%s", diff)
}
} else {
gotStatus := p.Filter(context.Background(), state, test.Pod, node)
if diff := cmp.Diff(gotStatus, test.wantStatus); diff != "" {
t.Errorf("status does not match (-want,+got):\n%s", diff)
}
}
})
}
@@ -423,6 +471,10 @@ func TestWithBinding(t *testing.T) {
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
state := framework.NewCycleState()
node := &framework.NodeInfo{}
node.SetNode(test.Node)
p := &VolumeZone{
@@ -430,10 +482,126 @@ func TestWithBinding(t *testing.T) {
pvcLister,
scLister,
}
gotStatus := p.Filter(context.Background(), nil, test.Pod, node)
if !reflect.DeepEqual(gotStatus, test.wantStatus) {
t.Errorf("status does not match: %v, want: %v", gotStatus, test.wantStatus)
_, gotPreFilterStatus := p.PreFilter(ctx, state, test.Pod)
if !gotPreFilterStatus.IsSuccess() {
if diff := cmp.Diff(gotPreFilterStatus, test.wantStatus); diff != "" {
t.Errorf("status does not match (-want,+got):\n%s", diff)
}
} else {
gotStatus := p.Filter(ctx, state, test.Pod, node)
if diff := cmp.Diff(gotStatus, test.wantStatus); diff != "" {
t.Errorf("status does not match (-want,+got):\n%s", diff)
}
}
})
}
}
func BenchmarkVolumeZone(b *testing.B) {
tests := []struct {
Name string
Pod *v1.Pod
NumPV int
NumPVC int
NumNodes int
PreFilter bool
}{
{
Name: "with prefilter",
Pod: createPodWithVolume("pod_0", "Vol_Stable_0", "PVC_Stable_0"),
NumPV: 1000,
NumPVC: 1000,
NumNodes: 1000,
PreFilter: true,
},
{
Name: "without prefilter",
Pod: createPodWithVolume("pod_0", "Vol_Stable_0", "PVC_Stable_0"),
NumPV: 1000,
NumPVC: 1000,
NumNodes: 1000,
PreFilter: false,
},
}
for _, tt := range tests {
b.Run(tt.Name, func(b *testing.B) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
nodes := makeNodesWithTopologyZone(tt.NumNodes)
pl := newPluginWithListers(ctx, b, []*v1.Pod{tt.Pod}, nodes, makePVCsWithPV(tt.NumPVC), makePVsWithZoneLabel(tt.NumPV))
nodeInfos := make([]*framework.NodeInfo, len(nodes), len(nodes))
for i := 0; i < len(nodes); i++ {
nodeInfo := &framework.NodeInfo{}
nodeInfo.SetNode(nodes[i])
nodeInfos[i] = nodeInfo
}
p := pl.(*VolumeZone)
state := framework.NewCycleState()
b.ResetTimer()
for i := 0; i < b.N; i++ {
if tt.PreFilter {
_, _ = p.PreFilter(ctx, state, tt.Pod)
}
for _, node := range nodeInfos {
_ = p.Filter(ctx, state, tt.Pod, node)
}
}
})
}
}
func newPluginWithListers(ctx context.Context, tb testing.TB, pods []*v1.Pod, nodes []*v1.Node, pvcs []*v1.PersistentVolumeClaim, pvs []*v1.PersistentVolume) framework.Plugin {
snapshot := cache.NewSnapshot(pods, nodes)
objects := make([]runtime.Object, 0, len(pvcs))
for _, pvc := range pvcs {
objects = append(objects, pvc)
}
for _, pv := range pvs {
objects = append(objects, pv)
}
return plugintesting.SetupPluginWithInformers(ctx, tb, New, &config.InterPodAffinityArgs{}, snapshot, objects)
}
func makePVsWithZoneLabel(num int) []*v1.PersistentVolume {
pvList := make([]*v1.PersistentVolume, num, num)
for i := 0; i < len(pvList); i++ {
pvName := fmt.Sprintf("Vol_Stable_%d", i)
zone := fmt.Sprintf("us-west-%d", i)
pvList[i] = &v1.PersistentVolume{
ObjectMeta: metav1.ObjectMeta{Name: pvName, Labels: map[string]string{v1.LabelTopologyZone: zone}},
}
}
return pvList
}
func makePVCsWithPV(num int) []*v1.PersistentVolumeClaim {
pvcList := make([]*v1.PersistentVolumeClaim, num, num)
for i := 0; i < len(pvcList); i++ {
pvcName := fmt.Sprintf("PVC_Stable_%d", i)
pvName := fmt.Sprintf("Vol_Stable_%d", i)
pvcList[i] = &v1.PersistentVolumeClaim{
ObjectMeta: metav1.ObjectMeta{Name: pvcName, Namespace: "default"},
Spec: v1.PersistentVolumeClaimSpec{VolumeName: pvName},
}
}
return pvcList
}
func makeNodesWithTopologyZone(num int) []*v1.Node {
nodeList := make([]*v1.Node, num, num)
for i := 0; i < len(nodeList); i++ {
nodeName := fmt.Sprintf("host_%d", i)
zone := fmt.Sprintf("us-west-0")
nodeList[i] = &v1.Node{
ObjectMeta: metav1.ObjectMeta{
Name: nodeName,
Labels: map[string]string{v1.LabelTopologyZone: zone, "uselessLabel": "none"},
},
}
}
return nodeList
}