syncutils.Go context cancellation fix

SaladTechnologies · Oct 14, 2024 · b9a6f3e · b9a6f3e
1 parent 239949c
commit b9a6f3e
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/internal/syncutil/limit.go b/internal/syncutil/limit.go
@@ -17,6 +17,7 @@ package syncutil
 
 import (
 	"context"
+	"errors"
 	"sync/atomic"
 
 	"golang.org/x/sync/errgroup"
@@ -83,7 +84,11 @@ func Go[T any](ctx context.Context, limiter *semaphore.Weighted, fn GoFunc[T], i
 				defer region.End()
 				err := fn(egCtx, region, t)
 				if err != nil {
-					egErr.CompareAndSwap(nil, err)
+					if errors.Is(err, context.Canceled) {
+						egErr.CompareAndSwap(nil, context.Canceled)
+					} else {
+						egErr.CompareAndSwap(nil, err)
+					}
 					return err
 				}
 				return nil