github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 04:27:54 +00:00
Code Issues Projects Releases Wiki Activity

scheduler_perf: fix goroutine leak in runWorkload

Browse Source 
This becomes relevant when doing more fine-grained leak checking.
This commit is contained in:
Patrick Ohly 2023-03-23 16:50:22 +01:00
parent 2e7f37353c
commit d9c16a1ced
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/integration/scheduler_perf/scheduler_perf_test.go
View File

@ -802,6 +802,12 @@ func runWorkload(ctx context.Context, b *testing.B, tc *testCase, w *workload, c
// need to start again. // need to start again.
podInformer := informerFactory.Core().V1().Pods() podInformer := informerFactory.Core().V1().Pods()
// Everything else started by this function gets stopped before it returns.
ctx, cancel := context.WithCancel(ctx)
var wg sync.WaitGroup
defer wg.Wait()
defer cancel()
var mu sync.Mutex var mu sync.Mutex
var dataItems []DataItem var dataItems []DataItem
nextNodeIndex := 0 nextNodeIndex := 0
@ -876,9 +882,14 @@ func runWorkload(ctx context.Context, b *testing.B, tc *testCase, w *workload, c
concreteOp.PodTemplatePath = tc.DefaultPodTemplatePath concreteOp.PodTemplatePath = tc.DefaultPodTemplatePath
} }
var collectors []testDataCollector var collectors []testDataCollector
// This needs a separate context and wait group because
// the code below needs to be sure that the goroutines
// are stopped.
var collectorCtx context.Context var collectorCtx context.Context
var collectorCancel func() var collectorCancel func()
var collectorWG sync.WaitGroup var collectorWG sync.WaitGroup
defer collectorWG.Wait()
if concreteOp.CollectMetrics { if concreteOp.CollectMetrics {
collectorCtx, collectorCancel = context.WithCancel(ctx) collectorCtx, collectorCancel = context.WithCancel(ctx)
defer collectorCancel() defer collectorCancel()
@ -987,7 +998,9 @@ func runWorkload(ctx context.Context, b *testing.B, tc *testCase, w *workload, c
switch concreteOp.Mode { switch concreteOp.Mode {
case Create: case Create:
wg.Add(1)
go func() { go func() {
defer wg.Done()
count, threshold := 0, concreteOp.Number count, threshold := 0, concreteOp.Number
if threshold == 0 { if threshold == 0 {
threshold = math.MaxInt32 threshold = math.MaxInt32
@ -1005,7 +1018,9 @@ func runWorkload(ctx context.Context, b *testing.B, tc *testCase, w *workload, c
} }
}() }()
case Recreate: case Recreate:
wg.Add(1)
go func() { go func() {
defer wg.Done()
retVals := make([][]string, len(churnFns)) retVals := make([][]string, len(churnFns))
// For each churn function, instantiate a slice of strings with length "concreteOp.Number". // For each churn function, instantiate a slice of strings with length "concreteOp.Number".
for i := range retVals { for i := range retVals {