Merge branch 'runner-wrapper-backoff-context' into 'main'

runner_wrapper: fix backoff retry context cancellation handling

See merge request https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/6064

Merged-by: Mikhail Mazurskiy <mmazurskiy@gitlab.com>
Approved-by: Mikhail Mazurskiy <mmazurskiy@gitlab.com>
Co-authored-by: Emmanuel326 <nyariboemmanuel8@gmail.com>

Author: ash2k

helpers/runner_wrapper/api/client/backoff.go

@@ -18,7 +18,11 @@ func RetryWithBackoff(ctx context.Context, timeout time.Duration, fn func() erro
 
 	var err error
 
-	cctx, cancelFn := context.WithDeadlineCause(ctx, time.Now().Add(timeout), fmt.Errorf("%w: %s", ErrRetryTimeoutExceeded, timeout))
+	cctx, cancelFn := context.WithDeadlineCause(
+		ctx,
+		time.Now().Add(timeout),
+		fmt.Errorf("%w: %s", ErrRetryTimeoutExceeded, timeout),
+	)
 	defer cancelFn()
 
 	for {
@@ -27,10 +31,15 @@ func RetryWithBackoff(ctx context.Context, timeout time.Duration, fn func() erro
 			return nil
 		}
 
+		timer := time.NewTimer(b.NextBackOff())
+
 		select {
 		case <-cctx.Done():
-			return ctx.Err()
-		case <-time.After(b.NextBackOff()):
+			timer.Stop()
+			return cctx.Err()
+		case <-timer.C:
+			// continue retrying
 		}
 	}
 }
+