Merge pull request kubernetes#2220 from mborsz/race

Avoid race in subsequent changes to the same controller
sysdiglabs · Dec 19, 2022 · ce673a9 · ce673a9
2 parents 83e45df + 19927c1
commit ce673a9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/clusterloader2/pkg/measurement/common/wait_for_controlled_pods.go b/clusterloader2/pkg/measurement/common/wait_for_controlled_pods.go
@@ -615,10 +615,10 @@ func (w *waitForControlledPodsRunningMeasurement) waitForRuntimeObject(obj runti
 	o := newObjectChecker(key)
 	o.lock.Lock()
 	defer o.lock.Unlock()
+	ctx, cancel := context.WithCancel(ctx)
+	o.cancel = cancel
 	w.handlingGroup.Start(func() {
-		ctx, cancel := context.WithCancel(ctx)
 		defer cancel()
-		o.SetCancel(cancel)
 		if operationTimeout != time.Duration(0) {
 			ctx, cancel = context.WithTimeout(ctx, operationTimeout)
 			defer cancel()