github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-08 12:41:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #113471 from ncdc/gc-contextual-logging

Browse Source 
garbagecollector: use contextual logging
This commit is contained in:
Kubernetes Prow Robot
2023-03-10 04:34:39 -08:00
committed by GitHub
parent c09d01192a cbf7d96a85
commit cb00077cd3
8 changed files with 253 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/integration/garbagecollector/garbage_collector_test.go
View File

@@ -46,6 +46,8 @@ import (
"k8s.io/client-go/restmapper"
"k8s.io/client-go/tools/cache"
"k8s.io/controller-manager/pkg/informerfactory"
"k8s.io/klog/v2"
"k8s.io/klog/v2/ktesting"
kubeapiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing"
"k8s.io/kubernetes/pkg/controller/garbagecollector"
"k8s.io/kubernetes/test/integration"
@@ -199,6 +201,7 @@ func createRandomCustomResourceDefinition(
}
type testContext struct {
logger klog.Logger
tearDown func()
gc *garbagecollector.GarbageCollector
clientSet clientset.Interface
@@ -258,7 +261,8 @@ func setupWithServer(t *testing.T, result *kubeapiservertesting.TestServer, work
t.Fatalf("failed to create garbage collector: %v", err)
}
ctx, cancel := context.WithCancel(context.Background())
logger, ctx := ktesting.NewTestContext(t)
ctx, cancel := context.WithCancel(ctx)
tearDown := func() {
cancel()
result.TearDownFn()
@@ -272,7 +276,7 @@ func setupWithServer(t *testing.T, result *kubeapiservertesting.TestServer, work
restMapper.Reset()
}, syncPeriod, ctx.Done())
go gc.Run(ctx, workers)
go gc.Sync(clientSet.Discovery(), syncPeriod, ctx.Done())
go gc.Sync(ctx, clientSet.Discovery(), syncPeriod)
}
if workerCount > 0 {
@@ -280,6 +284,7 @@ func setupWithServer(t *testing.T, result *kubeapiservertesting.TestServer, work
}
return &testContext{
logger: logger,
tearDown: tearDown,
gc: gc,
clientSet: clientSet,
@@ -1025,7 +1030,9 @@ func TestBlockingOwnerRefDoesBlock(t *testing.T) {
ctx.startGC(5)
timeout := make(chan struct{})
time.AfterFunc(5*time.Second, func() { close(timeout) })
if !cache.WaitForCacheSync(timeout, gc.IsSynced) {
if !cache.WaitForCacheSync(timeout, func() bool {
return gc.IsSynced(ctx.logger)
}) {
t.Fatalf("failed to wait for garbage collector to be synced")
}

2
test/integration/job/job_test.go
View File

@@ -2013,7 +2013,7 @@ func createGC(ctx context.Context, t *testing.T, restConfig *restclient.Config,
restMapper.Reset()
}, syncPeriod, ctx.Done())
go gc.Run(ctx, 1)
go gc.Sync(clientSet.Discovery(), syncPeriod, ctx.Done())
go gc.Sync(ctx, clientSet.Discovery(), syncPeriod)
}
return startGC
}