From 0639c6e1bc2fb3fb84e3e893f0b2a47e73039ccb Mon Sep 17 00:00:00 2001 From: roei3000b Date: Mon, 4 Mar 2024 15:45:00 +0200 Subject: [PATCH] Fix --- pkg/dlx/resourcestarter.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/dlx/resourcestarter.go b/pkg/dlx/resourcestarter.go index f8917f1..3b21c4f 100644 --- a/pkg/dlx/resourcestarter.go +++ b/pkg/dlx/resourcestarter.go @@ -97,7 +97,10 @@ func (r *ResourceStarter) startResource(ctx context.Context, resourceSinkChannel defer close(resourceReadyChannel) waitResourceReadinessCtx, cancelFunc := context.WithCancel(ctx) + waitResourceReadinessCtx, cancelFuncTimeout := context.WithTimeout(waitResourceReadinessCtx, 15*time.Minute) + defer cancelFunc() + defer cancelFuncTimeout() go r.waitResourceReadiness(waitResourceReadinessCtx, scalertypes.Resource{Name: resourceName, @@ -167,7 +170,7 @@ func (r *ResourceStarter) waitResourceReadiness(ctx context.Context, // callee decided to cancel, the resourceReadyChannel is already closed, // so we can just return without sending anything - if errors.Is(err, context.Canceled) { + if ctx.Err() != nil { r.logger.WarnWithCtx(ctx, "Wait resource readiness canceled", "resourceName", resource.Name)