IG-21104 - verify ctx cancelled to avoid sending on closed channel (#56)

v3io · Sep 7, 2022 · 1d80c06 · 1d80c06
1 parent c6dccca
commit 1d80c06
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/pkg/dlx/resourcestarter.go b/pkg/dlx/resourcestarter.go
@@ -139,6 +139,15 @@ func (r *ResourceStarter) waitResourceReadiness(ctx context.Context,
 	resourceReadyChannel chan error) {
 
 	err := r.scaler.SetScaleCtx(ctx, []scaler_types.Resource{resource}, 1)
+
+	// callee decided to cancel, the resourceReadyChannel is already closed,
+	// so we can just return without sending anything
+	if errors.RootCause(ctx.Err()) == context.Canceled || ctx.Err() == context.Canceled {
+		r.logger.WarnWithCtx(ctx,
+			"Wait resource readiness canceled",
+			"resourceName", resource.Name)
+		return
+	}
 	resourceReadyChannel <- err
 }