Skip to content

Commit 237e915

Browse files
authored
[DLX] Fix start resource function (#64)
1 parent 5ce4059 commit 237e915

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

pkg/dlx/resourcestarter.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ func (r *ResourceStarter) startResource(ctx context.Context, resourceSinkChannel
9696
// to avoid closing a channel that is still being used
9797
defer close(resourceReadyChannel)
9898

99-
waitResourceReadinessCtx, cancelFunc := context.WithCancel(ctx)
100-
defer cancelFunc()
99+
waitResourceReadinessCtx, cancelFuncTimeout := context.WithTimeout(ctx, 15*time.Minute)
100+
defer cancelFuncTimeout()
101101

102102
go r.waitResourceReadiness(waitResourceReadinessCtx,
103103
scalertypes.Resource{Name: resourceName,
@@ -167,10 +167,11 @@ func (r *ResourceStarter) waitResourceReadiness(ctx context.Context,
167167

168168
// callee decided to cancel, the resourceReadyChannel is already closed,
169169
// so we can just return without sending anything
170-
if errors.Is(err, context.Canceled) {
170+
if ctx.Err() != nil {
171171
r.logger.WarnWithCtx(ctx,
172172
"Wait resource readiness canceled",
173-
"resourceName", resource.Name)
173+
"resourceName", resource.Name,
174+
"err", ctx.Err())
174175
return
175176
}
176177
resourceReadyChannel <- err

0 commit comments

Comments
 (0)