startup: run convergence before post-start probes to avoid early deadlock
This commit is contained in:
parent
c7d7407008
commit
0f48773572
@ -370,6 +370,9 @@ func (o *Orchestrator) Startup(ctx context.Context, opts StartupOptions) (err er
|
||||
}
|
||||
return nil
|
||||
})
|
||||
if err := o.waitForStartupConvergence(ctx); err != nil {
|
||||
return err
|
||||
}
|
||||
if o.cfg.Startup.RequirePostStartProbes {
|
||||
if err := o.waitForPostStartProbes(ctx); err != nil {
|
||||
o.noteStartupCheck("post-start-probes", false, err.Error())
|
||||
@ -377,9 +380,6 @@ func (o *Orchestrator) Startup(ctx context.Context, opts StartupOptions) (err er
|
||||
}
|
||||
o.noteStartupCheck("post-start-probes", true, "post-start probes passed")
|
||||
}
|
||||
if err := o.waitForStartupConvergence(ctx); err != nil {
|
||||
return err
|
||||
}
|
||||
o.log.Printf("startup flow complete")
|
||||
return nil
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user