fix(host): defer cancel context in loop block

yunionio · Jan 11, 2025 · 4bdb85c · 4bdb85c
1 parent 87e2ab3
commit 4bdb85c
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/pkg/util/pod/pod.go b/pkg/util/pod/pod.go
@@ -331,9 +331,11 @@ func (c crictl) RemovePod(ctx context.Context, podId string) error {
 	interval := 5 * time.Second
 	errs := []error{}
 	for tries := 0; tries < maxTries; tries++ {
-		ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
-		defer cancel()
-		err := c.removePod(ctx, podId)
+		err := func() error {
+			ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
+			defer cancel()
+			return c.removePod(ctx, podId)
+		}()
 		if err == nil {
 			return nil
 		}
@@ -361,10 +363,11 @@ func (c crictl) stopContainerWithRetry(ctx context.Context, ctrId string, timeou
 	interval := 5 * time.Second
 	errs := []error{}
 	for tries := 0; tries < maxTries; tries++ {
-		ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
-		defer cancel()
-
-		err := c.stopContainer(ctx, ctrId, timeout)
+		err := func() error {
+			ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
+			defer cancel()
+			return c.stopContainer(ctx, ctrId, timeout)
+		}()
 		if err == nil {
 			return nil
 		}