github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-19 18:02:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #114653 from kerthcet/cleanup/remove-waitstop

Browse Source 
Stop Cache in scheduler when tests tear down
This commit is contained in:
Kubernetes Prow Robot 2023-01-05 09:11:59 -08:00 committed by GitHub
commit 67622be450
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/scheduler/extender_test.go
View File

@ -25,7 +25,6 @@ import (
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/informers"
clientsetfake "k8s.io/client-go/kubernetes/fake"
extenderv1 "k8s.io/kube-scheduler/extender/v1"
@ -279,12 +278,13 @@ func TestSchedulerWithExtenders(t *testing.T) {
for ii := range test.extenders {
extenders = append(extenders, &test.extenders[ii])
}
cache := internalcache.New(time.Duration(0), wait.NeverStop)
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
cache := internalcache.New(time.Duration(0), ctx.Done())
for _, name := range test.nodes {
cache.AddNode(createNode(name))
}
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
fwk, err := st.NewFramework(
test.registerPlugins, "", ctx.Done(),
runtime.WithClientSet(client),

33
pkg/scheduler/schedule_one_test.go
View File

@ -1983,7 +1983,10 @@ func TestSchedulerSchedulePod(t *testing.T) {
}
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
cache := internalcache.New(time.Duration(0), wait.NeverStop)
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
cache := internalcache.New(time.Duration(0), ctx.Done())
for _, pod := range test.pods {
cache.AddPod(pod)
}
@ -1994,8 +1997,6 @@ func TestSchedulerSchedulePod(t *testing.T) {
cache.AddNode(node)
}
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
cs := clientsetfake.NewSimpleClientset()
informerFactory := informers.NewSharedInformerFactory(cs, 0)
for _, pvc := range test.pvcs {
@ -2054,11 +2055,12 @@ func TestSchedulerSchedulePod(t *testing.T) {
}
func TestFindFitAllError(t *testing.T) {
nodes := makeNodeList([]string{"3", "2", "1"})
scheduler := makeScheduler(nodes)
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
nodes := makeNodeList([]string{"3", "2", "1"})
scheduler := makeScheduler(ctx, nodes)
fwk, err := st.NewFramework(
[]st.RegisterPluginFunc{
st.RegisterQueueSortPlugin(queuesort.Name, queuesort.New),
@ -2093,11 +2095,12 @@ func TestFindFitAllError(t *testing.T) {
}
func TestFindFitSomeError(t *testing.T) {
nodes := makeNodeList([]string{"3", "2", "1"})
scheduler := makeScheduler(nodes)
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
nodes := makeNodeList([]string{"3", "2", "1"})
scheduler := makeScheduler(ctx, nodes)
fwk, err := st.NewFramework(
[]st.RegisterPluginFunc{
st.RegisterQueueSortPlugin(queuesort.Name, queuesort.New),
@ -2188,7 +2191,7 @@ func TestFindFitPredicateCallCounts(t *testing.T) {
t.Fatal(err)
}
scheduler := makeScheduler(nodes)
scheduler := makeScheduler(ctx, nodes)
if err := scheduler.Cache.UpdateSnapshot(scheduler.nodeInfoSnapshot); err != nil {
t.Fatal(err)
}
@ -2597,9 +2600,10 @@ func TestFairEvaluationForNodes(t *testing.T) {
nodeNames = append(nodeNames, strconv.Itoa(i))
}
nodes := makeNodeList(nodeNames)
sched := makeScheduler(nodes)
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
sched := makeScheduler(ctx, nodes)
fwk, err := st.NewFramework(
[]st.RegisterPluginFunc{
st.RegisterQueueSortPlugin(queuesort.Name, queuesort.New),
@ -2661,11 +2665,14 @@ func TestPreferNominatedNodeFilterCallCounts(t *testing.T) {
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
// create three nodes in the cluster.
nodes := makeNodeList([]string{"node1", "node2", "node3"})
client := clientsetfake.NewSimpleClientset(test.pod)
informerFactory := informers.NewSharedInformerFactory(client, 0)
cache := internalcache.New(time.Duration(0), wait.NeverStop)
cache := internalcache.New(time.Duration(0), ctx.Done())
for _, n := range nodes {
cache.AddNode(n)
}
@ -2681,8 +2688,6 @@ func TestPreferNominatedNodeFilterCallCounts(t *testing.T) {
registerFakeFilterFunc,
st.RegisterBindPlugin(defaultbinder.Name, defaultbinder.New),
}
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
fwk, err := st.NewFramework(
registerPlugins, "", ctx.Done(),
frameworkruntime.WithClientSet(client),
@ -2744,8 +2749,8 @@ func makeNodeList(nodeNames []string) []*v1.Node {
}
// makeScheduler makes a simple Scheduler for testing.
func makeScheduler(nodes []*v1.Node) *Scheduler {
cache := internalcache.New(time.Duration(0), wait.NeverStop)
func makeScheduler(ctx context.Context, nodes []*v1.Node) *Scheduler {
cache := internalcache.New(time.Duration(0), ctx.Done())
for _, n := range nodes {
cache.AddNode(n)
}