oss/forgejo-runner
oss/forgejo-runner
1
0
Fork 0
mirror of https://code.forgejo.org/forgejo/runner.git synced 2025-08-26 18:20:59 +00:00
Code Wiki Activity

simplify loop delay

Browse source
This commit is contained in:
Mathieu Fenniak 2025-08-05 21:13:18 -06:00
parent fdec3fe75b
commit 7b75a647d4
1 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
act/runner/run_context.go
View file

@ -759,7 +759,6 @@ func (rc *RunContext) waitForServiceContainer(c container.ExecutionsEnvironment,
ctx, cancel := context.WithTimeout(ctx, *timeout) ctx, cancel := context.WithTimeout(ctx, *timeout)
defer cancel() defer cancel()
delay := time.Second
for { for {
health, err := c.GetHealth(ctx) health, err := c.GetHealth(ctx)
if errors.Is(err, context.DeadlineExceeded) { if errors.Is(err, context.DeadlineExceeded) {
@ -769,21 +768,17 @@ func (rc *RunContext) waitForServiceContainer(c container.ExecutionsEnvironment,
} else if errors.Is(err, container.ErrContainerNotFound) || (err == nil && health == container.HealthUnHealthy) { } else if errors.Is(err, container.ErrContainerNotFound) || (err == nil && health == container.HealthUnHealthy) {
// Container absent (terminated during health check) and unhealthy are difficult to consistently report // Container absent (terminated during health check) and unhealthy are difficult to consistently report
// differently from each other as, in docker, a terminated container will briefly appear unhealthy and // differently from each other as, in docker, a terminated container will briefly appear unhealthy and
// then start reporting container not found; so, report both the same. Without any detection of the // then start reporting container not found making the difference race-y. So, report both the same.
// ErrContainerNotFound case we would just treat it as a transient failure and timeout, which would be a //
// slower error mode that this is working to avoid. // Without any detection of the ErrContainerNotFound case we would just treat it as a transient failure
// and timeout, which would be a slower error mode that this is working to avoid.
return fmt.Errorf("service container %s: failed health check or terminated before becoming healthy", serviceID) return fmt.Errorf("service container %s: failed health check or terminated before becoming healthy", serviceID)
} else if err != nil { } else if err != nil {
// assume transient error in the execution environment
logger.Warnf("service container %s: error while checking for health state, will retry: %v", serviceID, err) logger.Warnf("service container %s: error while checking for health state, will retry: %v", serviceID, err)
} else if health == container.HealthHealthy { } else if health == container.HealthHealthy {
return nil return nil
} }
time.Sleep(delay) time.Sleep(time.Second)
delay *= 2
if delay > 10*time.Second {
delay = 10 * time.Second
}
} }
} }
} }