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

fix: don't retry indefinitly with local scaling #2974

Merged
merged 1 commit into from
Oct 3, 2024
Merged

fix: don't retry indefinitly with local scaling #2974

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 8 additions & 1 deletion backend/controller/scaling/localscaling/local_scaling.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ import (

var _ scaling.RunnerScaling = &localScaling{}

const maxExits = 10

type localScaling struct {
lock sync.Mutex
cacheDir string
Expand Down Expand Up @@ -71,6 +73,7 @@ type deploymentInfo struct {
replicas int32
key string
language string
exits int
}
type runnerInfo struct {
cancelFunc context.CancelFunc
Expand Down Expand Up @@ -133,7 +136,7 @@ func (l *localScaling) handleSchemaChange(ctx context.Context, msg *ftlv1.PullSc
func (l *localScaling) reconcileRunners(ctx context.Context, deploymentRunners *deploymentInfo) error {
// Must be called under lock
logger := log.FromContext(ctx)
if deploymentRunners.replicas > 0 && !deploymentRunners.runner.Ok() {
if deploymentRunners.replicas > 0 && !deploymentRunners.runner.Ok() && deploymentRunners.exits < maxExits {
if err := l.startRunner(ctx, deploymentRunners.key, deploymentRunners); err != nil {
logger.Errorf(err, "Failed to start runner")
return err
Expand Down Expand Up @@ -205,6 +208,10 @@ func (l *localScaling) startRunner(ctx context.Context, deploymentKey string, in
}
l.lock.Lock()
defer l.lock.Unlock()
info.exits++
if info.exits >= maxExits {
logger.Errorf(fmt.Errorf("too many restarts"), "Runner failed too many times, not restarting")
}
info.runner = optional.None[runnerInfo]()
if l.debugPorts[info.module] == debug {
delete(l.debugPorts, info.module)
Expand Down
Loading