github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-08 03:33:56 +00:00
Code Issues Projects Releases Wiki Activity

scheduler_perf: fix race condition

Browse Source 
collector.collect got called without ensuring that collector.run had
terminated, so it could have happened that collector.run adds another sample
while collector.collect is reading them.
This commit is contained in:
Patrick Ohly 2023-01-27 18:08:15 +01:00
parent ad18954259
commit 49bbf7c268
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -832,12 +832,19 @@ func runWorkload(ctx context.Context, b *testing.B, tc *testCase, w *workload) [
var collectors []testDataCollector
var collectorCtx context.Context
var collectorCancel func()
var collectorWG sync.WaitGroup
if concreteOp.CollectMetrics {
collectorCtx, collectorCancel = context.WithCancel(ctx)
defer collectorCancel()
collectors = getTestDataCollectors(podInformer, fmt.Sprintf("%s/%s", b.Name(), namespace), namespace, tc.MetricsCollectorConfig)
for _, collector := range collectors {
go collector.run(collectorCtx)
// Need loop-local variable for function below.
collector := collector
collectorWG.Add(1)
go func() {
defer collectorWG.Done()
collector.run(collectorCtx)
}()
}
}
if err := createPods(ctx, b, namespace, concreteOp, client); err != nil {
@ -861,6 +868,7 @@ func runWorkload(ctx context.Context, b *testing.B, tc *testCase, w *workload) [
// same time, so if we're here, it means that all pods have been
// scheduled.
collectorCancel()
collectorWG.Wait()
mu.Lock()
for _, collector := range collectors {
dataItems = append(dataItems, collector.collect()...)