Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DLX] Fix start resource function #64

Merged
merged 2 commits into from
Mar 6, 2024
Merged

[DLX] Fix start resource function #64

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0639c6e
Fix
roei3000b Mar 4, 2024
1a55708
Fix cr
roei3000b Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions pkg/dlx/resourcestarter.go
View file
Open in desktop
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",
roei3000b marked this conversation as resolved.
Show resolved Hide resolved
"resourceName", resource.Name)
"resourceName", resource.Name,
"err", ctx.Err())
return
}
resourceReadyChannel <- err
Expand Down
Loading