Skip to content

K
k3s
Commit 48ac1b1a authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #48775 from vikaschoudhary16/test_assumed_pod

Automatic merge from submit-queue (batch tested with PRs 48224, 45431, 45946, 48775, 49396) Enhance scheduler cache unit tests to cover OIR in pod spec /kind test **What this PR does / why we need it**: More code coverage. This PR covers the scenario when pod requests opaque-integer-resources and unit test the logic in scheduler which deals with parsing oirs in the pod object and stores the same in node info. Signed-off-by: 's avatarvikaschoudhary16 <choudharyvikas16@gmail.com>
parents a25a51cc df4f4d34
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 19 deletions
plugin/pkg/scheduler/schedulercache/BUILD
View file @ 48ac1b1a
...@@ -35,6 +35,7 @@ go_test( ...@@ -35,6 +35,7 @@ go_test(
library = ":go_default_library", library = ":go_default_library",
tags = ["automanaged"], tags = ["automanaged"],
deps = [ deps = [
"//pkg/api/v1/helper:go_default_library",
"//plugin/pkg/scheduler/algorithm/priorities/util:go_default_library", "//plugin/pkg/scheduler/algorithm/priorities/util:go_default_library",
"//plugin/pkg/scheduler/util:go_default_library", "//plugin/pkg/scheduler/util:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library",
......
plugin/pkg/scheduler/schedulercache/cache_test.go
View file @ 48ac1b1a
...@@ -19,6 +19,7 @@ package schedulercache ...@@ -19,6 +19,7 @@ package schedulercache
import ( import (
"fmt" "fmt"
"reflect" "reflect"
"strings"
"testing" "testing"
"time" "time"
...@@ -26,6 +27,7 @@ import ( ...@@ -26,6 +27,7 @@ import (
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
v1helper "k8s.io/kubernetes/pkg/api/v1/helper"
priorityutil "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util" priorityutil "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util"
schedutil "k8s.io/kubernetes/plugin/pkg/scheduler/util" schedutil "k8s.io/kubernetes/plugin/pkg/scheduler/util"
) )
...@@ -45,10 +47,13 @@ func deepEqualWithoutGeneration(t *testing.T, testcase int, actual, expected *No ...@@ -45,10 +47,13 @@ func deepEqualWithoutGeneration(t *testing.T, testcase int, actual, expected *No
func TestAssumePodScheduled(t *testing.T) { func TestAssumePodScheduled(t *testing.T) {
nodeName := "node" nodeName := "node"
testPods := []*v1.Pod{ testPods := []*v1.Pod{
makeBasePod(nodeName, "test", "100m", "500", []v1.ContainerPort{{HostPort: 80}}), makeBasePod(t, nodeName, "test", "100m", "500", "", []v1.ContainerPort{{HostPort: 80}}),
makeBasePod(nodeName, "test-1", "100m", "500", []v1.ContainerPort{{HostPort: 80}}), makeBasePod(t, nodeName, "test-1", "100m", "500", "", []v1.ContainerPort{{HostPort: 80}}),
makeBasePod(nodeName, "test-2", "200m", "1Ki", []v1.ContainerPort{{HostPort: 8080}}), makeBasePod(t, nodeName, "test-2", "200m", "1Ki", "", []v1.ContainerPort{{HostPort: 8080}}),
makeBasePod(nodeName, "test-nonzero", "", "", []v1.ContainerPort{{HostPort: 80}}), makeBasePod(t, nodeName, "test-nonzero", "", "", "", []v1.ContainerPort{{HostPort: 80}}),
makeBasePod(t, nodeName, "test", "100m", "500", "oir-foo:3", []v1.ContainerPort{{HostPort: 80}}),
makeBasePod(t, nodeName, "test-2", "200m", "1Ki", "oir-foo:5", []v1.ContainerPort{{HostPort: 8080}}),
makeBasePod(t, nodeName, "test", "100m", "500", "random-invalid-oir-key:100", []v1.ContainerPort{{}}),
} }
tests := []struct { tests := []struct {
...@@ -100,7 +105,55 @@ func TestAssumePodScheduled(t *testing.T) { ...@@ -100,7 +105,55 @@ func TestAssumePodScheduled(t *testing.T) {
pods: []*v1.Pod{testPods[3]}, pods: []*v1.Pod{testPods[3]},
usedPorts: map[int]bool{80: true}, usedPorts: map[int]bool{80: true},
}, },
}} }, {
pods: []*v1.Pod{testPods[4]},
wNodeInfo: &NodeInfo{
requestedResource: &Resource{
MilliCPU: 100,
Memory: 500,
OpaqueIntResources: map[v1.ResourceName]int64{"pod.alpha.kubernetes.io/opaque-int-resource-oir-foo": 3},
},
nonzeroRequest: &Resource{
MilliCPU: 100,
Memory: 500,
},
allocatableResource: &Resource{},
pods: []*v1.Pod{testPods[4]},
usedPorts: map[int]bool{80: true},
},
}, {
pods: []*v1.Pod{testPods[4], testPods[5]},
wNodeInfo: &NodeInfo{
requestedResource: &Resource{
MilliCPU: 300,
Memory: 1524,
OpaqueIntResources: map[v1.ResourceName]int64{"pod.alpha.kubernetes.io/opaque-int-resource-oir-foo": 8},
},
nonzeroRequest: &Resource{
MilliCPU: 300,
Memory: 1524,
},
allocatableResource: &Resource{},
pods: []*v1.Pod{testPods[4], testPods[5]},
usedPorts: map[int]bool{80: true, 8080: true},
},
}, {
pods: []*v1.Pod{testPods[6]},
wNodeInfo: &NodeInfo{
requestedResource: &Resource{
MilliCPU: 100,
Memory: 500,
},
nonzeroRequest: &Resource{
MilliCPU: 100,
Memory: 500,
},
allocatableResource: &Resource{},
pods: []*v1.Pod{testPods[6]},
usedPorts: map[int]bool{},
},
},
}
for i, tt := range tests { for i, tt := range tests {
cache := newSchedulerCache(time.Second, time.Second, nil) cache := newSchedulerCache(time.Second, time.Second, nil)
...@@ -140,8 +193,8 @@ func assumeAndFinishBinding(cache *schedulerCache, pod *v1.Pod, assumedTime time ...@@ -140,8 +193,8 @@ func assumeAndFinishBinding(cache *schedulerCache, pod *v1.Pod, assumedTime time
func TestExpirePod(t *testing.T) { func TestExpirePod(t *testing.T) {
nodeName := "node" nodeName := "node"
testPods := []*v1.Pod{ testPods := []*v1.Pod{
makeBasePod(nodeName, "test-1", "100m", "500", []v1.ContainerPort{{HostPort: 80}}), makeBasePod(t, nodeName, "test-1", "100m", "500", "", []v1.ContainerPort{{HostPort: 80}}),
makeBasePod(nodeName, "test-2", "200m", "1Ki", []v1.ContainerPort{{HostPort: 8080}}), makeBasePod(t, nodeName, "test-2", "200m", "1Ki", "", []v1.ContainerPort{{HostPort: 8080}}),
} }
now := time.Now() now := time.Now()
ttl := 10 * time.Second ttl := 10 * time.Second
...@@ -200,8 +253,8 @@ func TestAddPodWillConfirm(t *testing.T) { ...@@ -200,8 +253,8 @@ func TestAddPodWillConfirm(t *testing.T) {
ttl := 10 * time.Second ttl := 10 * time.Second
testPods := []*v1.Pod{ testPods := []*v1.Pod{
makeBasePod(nodeName, "test-1", "100m", "500", []v1.ContainerPort{{HostPort: 80}}), makeBasePod(t, nodeName, "test-1", "100m", "500", "", []v1.ContainerPort{{HostPort: 80}}),
makeBasePod(nodeName, "test-2", "200m", "1Ki", []v1.ContainerPort{{HostPort: 8080}}), makeBasePod(t, nodeName, "test-2", "200m", "1Ki", "", []v1.ContainerPort{{HostPort: 8080}}),
} }
tests := []struct { tests := []struct {
podsToAssume []*v1.Pod podsToAssume []*v1.Pod
...@@ -249,7 +302,7 @@ func TestAddPodWillConfirm(t *testing.T) { ...@@ -249,7 +302,7 @@ func TestAddPodWillConfirm(t *testing.T) {
func TestAddPodAfterExpiration(t *testing.T) { func TestAddPodAfterExpiration(t *testing.T) {
nodeName := "node" nodeName := "node"
ttl := 10 * time.Second ttl := 10 * time.Second
basePod := makeBasePod(nodeName, "test", "100m", "500", []v1.ContainerPort{{HostPort: 80}}) basePod := makeBasePod(t, nodeName, "test", "100m", "500", "", []v1.ContainerPort{{HostPort: 80}})
tests := []struct { tests := []struct {
pod *v1.Pod pod *v1.Pod
...@@ -297,8 +350,8 @@ func TestUpdatePod(t *testing.T) { ...@@ -297,8 +350,8 @@ func TestUpdatePod(t *testing.T) {
nodeName := "node" nodeName := "node"
ttl := 10 * time.Second ttl := 10 * time.Second
testPods := []*v1.Pod{ testPods := []*v1.Pod{
makeBasePod(nodeName, "test", "100m", "500", []v1.ContainerPort{{HostPort: 80}}), makeBasePod(t, nodeName, "test", "100m", "500", "", []v1.ContainerPort{{HostPort: 80}}),
makeBasePod(nodeName, "test", "200m", "1Ki", []v1.ContainerPort{{HostPort: 8080}}), makeBasePod(t, nodeName, "test", "200m", "1Ki", "", []v1.ContainerPort{{HostPort: 8080}}),
} }
tests := []struct { tests := []struct {
podsToAssume []*v1.Pod podsToAssume []*v1.Pod
...@@ -363,8 +416,8 @@ func TestExpireAddUpdatePod(t *testing.T) { ...@@ -363,8 +416,8 @@ func TestExpireAddUpdatePod(t *testing.T) {
nodeName := "node" nodeName := "node"
ttl := 10 * time.Second ttl := 10 * time.Second
testPods := []*v1.Pod{ testPods := []*v1.Pod{
makeBasePod(nodeName, "test", "100m", "500", []v1.ContainerPort{{HostPort: 80}}), makeBasePod(t, nodeName, "test", "100m", "500", "", []v1.ContainerPort{{HostPort: 80}}),
makeBasePod(nodeName, "test", "200m", "1Ki", []v1.ContainerPort{{HostPort: 8080}}), makeBasePod(t, nodeName, "test", "200m", "1Ki", "", []v1.ContainerPort{{HostPort: 8080}}),
} }
tests := []struct { tests := []struct {
podsToAssume []*v1.Pod podsToAssume []*v1.Pod
...@@ -436,7 +489,7 @@ func TestExpireAddUpdatePod(t *testing.T) { ...@@ -436,7 +489,7 @@ func TestExpireAddUpdatePod(t *testing.T) {
// TestRemovePod tests after added pod is removed, its information should also be subtracted. // TestRemovePod tests after added pod is removed, its information should also be subtracted.
func TestRemovePod(t *testing.T) { func TestRemovePod(t *testing.T) {
nodeName := "node" nodeName := "node"
basePod := makeBasePod(nodeName, "test", "100m", "500", []v1.ContainerPort{{HostPort: 80}}) basePod := makeBasePod(t, nodeName, "test", "100m", "500", "", []v1.ContainerPort{{HostPort: 80}})
tests := []struct { tests := []struct {
pod *v1.Pod pod *v1.Pod
wNodeInfo *NodeInfo wNodeInfo *NodeInfo
...@@ -478,7 +531,7 @@ func TestRemovePod(t *testing.T) { ...@@ -478,7 +531,7 @@ func TestRemovePod(t *testing.T) {
func TestForgetPod(t *testing.T) { func TestForgetPod(t *testing.T) {
nodeName := "node" nodeName := "node"
basePod := makeBasePod(nodeName, "test", "100m", "500", []v1.ContainerPort{{HostPort: 80}}) basePod := makeBasePod(t, nodeName, "test", "100m", "500", "", []v1.ContainerPort{{HostPort: 80}})
tests := []struct { tests := []struct {
pods []*v1.Pod pods []*v1.Pod
}{{ }{{
...@@ -751,13 +804,30 @@ func benchmarkExpire(b *testing.B, podNum int) { ...@@ -751,13 +804,30 @@ func benchmarkExpire(b *testing.B, podNum int) {
} }
} }
func makeBasePod(nodeName, objName, cpu, mem string, ports []v1.ContainerPort) *v1.Pod { type testingMode interface {
Fatalf(format string, args ...interface{})
}
func makeBasePod(t testingMode, nodeName, objName, cpu, mem, oir string, ports []v1.ContainerPort) *v1.Pod {
req := v1.ResourceList{} req := v1.ResourceList{}
if cpu != "" { if cpu != "" {
req = v1.ResourceList{ req = v1.ResourceList{
v1.ResourceCPU: resource.MustParse(cpu), v1.ResourceCPU: resource.MustParse(cpu),
v1.ResourceMemory: resource.MustParse(mem), v1.ResourceMemory: resource.MustParse(mem),
} }
if oir != "" {
if len(strings.Split(oir, ":")) != 2 {
t.Fatalf("Invalid OIR string")
}
var name v1.ResourceName
if strings.Split(oir, ":")[0] != "random-invalid-oir-key" {
name = v1helper.OpaqueIntResourceName(strings.Split(oir, ":")[0])
} else {
name = v1.ResourceName(strings.Split(oir, ":")[0])
}
quantity := resource.MustParse(strings.Split(oir, ":")[1])
req[name] = quantity
}
} }
return &v1.Pod{ return &v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
...@@ -782,7 +852,7 @@ func setupCacheOf1kNodes30kPods(b *testing.B) Cache { ...@@ -782,7 +852,7 @@ func setupCacheOf1kNodes30kPods(b *testing.B) Cache {
nodeName := fmt.Sprintf("node-%d", i) nodeName := fmt.Sprintf("node-%d", i)
for j := 0; j < 30; j++ { for j := 0; j < 30; j++ {
objName := fmt.Sprintf("%s-pod-%d", nodeName, j) objName := fmt.Sprintf("%s-pod-%d", nodeName, j)
pod := makeBasePod(nodeName, objName, "0", "0", nil) pod := makeBasePod(b, nodeName, objName, "0", "0", "", nil)
if err := cache.AddPod(pod); err != nil { if err := cache.AddPod(pod); err != nil {
b.Fatalf("AddPod failed: %v", err) b.Fatalf("AddPod failed: %v", err)
...@@ -797,7 +867,7 @@ func setupCacheWithAssumedPods(b *testing.B, podNum int, assumedTime time.Time) ...@@ -797,7 +867,7 @@ func setupCacheWithAssumedPods(b *testing.B, podNum int, assumedTime time.Time)
for i := 0; i < podNum; i++ { for i := 0; i < podNum; i++ {
nodeName := fmt.Sprintf("node-%d", i/10) nodeName := fmt.Sprintf("node-%d", i/10)
objName := fmt.Sprintf("%s-pod-%d", nodeName, i%10) objName := fmt.Sprintf("%s-pod-%d", nodeName, i%10)
pod := makeBasePod(nodeName, objName, "0", "0", nil) pod := makeBasePod(b, nodeName, objName, "0", "0", "", nil)
err := assumeAndFinishBinding(cache, pod, assumedTime) err := assumeAndFinishBinding(cache, pod, assumedTime)
if err != nil { if err != nil {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment