Skip to content

Commit 1d80c06

Browse files
authored
IG-21104 - verify ctx cancelled to avoid sending on closed channel (#56)
1 parent c6dccca commit 1d80c06

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

pkg/dlx/resourcestarter.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,15 @@ func (r *ResourceStarter) waitResourceReadiness(ctx context.Context,
139139
resourceReadyChannel chan error) {
140140

141141
err := r.scaler.SetScaleCtx(ctx, []scaler_types.Resource{resource}, 1)
142+
143+
// callee decided to cancel, the resourceReadyChannel is already closed,
144+
// so we can just return without sending anything
145+
if errors.RootCause(ctx.Err()) == context.Canceled || ctx.Err() == context.Canceled {
146+
r.logger.WarnWithCtx(ctx,
147+
"Wait resource readiness canceled",
148+
"resourceName", resource.Name)
149+
return
150+
}
142151
resourceReadyChannel <- err
143152
}
144153

0 commit comments

Comments
 (0)