From 486d12efc5f28a9116b2e4cb31fb9f0404faf19e Mon Sep 17 00:00:00 2001 From: YamasouA Date: Sat, 1 Mar 2025 00:14:49 +0900 Subject: [PATCH] call cleanup func position change --- test/integration/scheduler_perf/scheduler_perf.go | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/test/integration/scheduler_perf/scheduler_perf.go b/test/integration/scheduler_perf/scheduler_perf.go index 192c6974b91..1cc7f7d752a 100644 --- a/test/integration/scheduler_perf/scheduler_perf.go +++ b/test/integration/scheduler_perf/scheduler_perf.go @@ -1426,6 +1426,9 @@ func startCollectingMetrics(tCtx ktesting.TContext, collectorWG *sync.WaitGroup, if err != nil { return nil, nil, fmt.Errorf("op %d: Failed to initialize data collector: %v", opIndex, err) } + tCtx.TB().Cleanup(func() { + collectorCtx.Cancel("cleaning up") + }) collectorWG.Add(1) go func() { defer collectorWG.Done() @@ -1663,11 +1666,6 @@ func (e *WorkloadExecutor) runCreatePodsOp(opIndex int, op *createPodsOp) error if err != nil { return err } - e.tCtx.TB().Cleanup(func() { - if e.collectorCtx != nil { - e.collectorCtx.Cancel("cleaning up") - } - }) } if err := createPodsRapidly(e.tCtx, namespace, op); err != nil { return fmt.Errorf("op %d: %v", opIndex, err) @@ -1879,11 +1877,6 @@ func (e *WorkloadExecutor) runStartCollectingMetricsOp(opIndex int, op *startCol if err != nil { return err } - e.tCtx.TB().Cleanup(func() { - if e.collectorCtx != nil { - e.collectorCtx.Cancel("cleaning up") - } - }) return nil }