Skip to content

Commit

Permalink
[DLX] Fix start resource function (#64)
Browse files Browse the repository at this point in the history
  • Loading branch information
roei3000b authored Mar 6, 2024
1 parent 5ce4059 commit 237e915
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions pkg/dlx/resourcestarter.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ func (r *ResourceStarter) startResource(ctx context.Context, resourceSinkChannel
// to avoid closing a channel that is still being used
defer close(resourceReadyChannel)

waitResourceReadinessCtx, cancelFunc := context.WithCancel(ctx)
defer cancelFunc()
waitResourceReadinessCtx, cancelFuncTimeout := context.WithTimeout(ctx, 15*time.Minute)
defer cancelFuncTimeout()

go r.waitResourceReadiness(waitResourceReadinessCtx,
scalertypes.Resource{Name: resourceName,
Expand Down Expand Up @@ -167,10 +167,11 @@ 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)
"resourceName", resource.Name,
"err", ctx.Err())
return
}
resourceReadyChannel <- err
Expand Down

0 comments on commit 237e915

Please sign in to comment.