Skip to content

Commit

Permalink
fix: NPE in select (#3335)
Browse files Browse the repository at this point in the history
  • Loading branch information
stuartwdouglas authored Nov 6, 2024
1 parent 0553195 commit e5158ed
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion backend/controller/scaling/scaling.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,19 @@ type RunnerScaling interface {

func BeginGrpcScaling(ctx context.Context, url url.URL, leaser leases.Leaser, handler func(ctx context.Context, msg *ftlv1.PullSchemaResponse) error) {
leaseTimeout := time.Second * 20
var leaseDone <-chan struct{}

for {
// Grab a lease to take control of runner scaling
lease, leaseContext, err := leaser.AcquireLease(ctx, leases.SystemKey("ftl-scaling", "runner-creation"), leaseTimeout, optional.None[any]())
if err == nil {
leaseDone = leaseContext.Done()
// If we get it then we take over runner scaling
runGrpcScaling(leaseContext, url, handler)
} else if !errors.Is(err, leases.ErrConflict) {
logger := log.FromContext(ctx)
logger.Errorf(err, "Failed to acquire lease")
leaseDone = nil
}
select {
case <-ctx.Done():
Expand All @@ -44,7 +48,8 @@ func BeginGrpcScaling(ctx context.Context, url url.URL, leaser leases.Leaser, ha
}
}
return
case <-leaseContext.Done():
case <-time.After(leaseTimeout):
case <-leaseDone:
}
}
}
Expand Down

0 comments on commit e5158ed

Please sign in to comment.