lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

engine: Retry should be stateful and add RetryReset

Browse Source 
Make the retry meta param a bit more sane now that we can persist it
between graph switches. This also unblocks us from pausing during retry
loops.
This commit is contained in:
James Shubin
2023-09-01 21:11:27 -04:00
parent 9545e409d4
commit f9bc50e262
4 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lang/ast/structs.go
View File

@@ -920,6 +920,9 @@ func (obj *StmtRes) metaparams(res engine.Res) error {
// TODO: check that it doesn't overflow
meta.Retry = int16(x)
case "retryreset":
meta.RetryReset = v.Bool() // must not panic
case "delay":
x := v.Int() // must not panic
// TODO: check that it isn't signed
@@ -984,6 +987,9 @@ func (obj *StmtRes) metaparams(res engine.Res) error {
// TODO: check that it doesn't overflow
meta.Retry = int16(x)
}
if val, exists := v.Struct()["retryreset"]; exists {
meta.RetryReset = val.Bool() // must not panic
}
if val, exists := v.Struct()["delay"]; exists {
x := val.Int() // must not panic
// TODO: check that it isn't signed
@@ -1596,6 +1602,7 @@ func (obj *StmtResMeta) Init(data *interfaces.Data) error {
// TODO: we could add these fields dynamically if we were fancy!
case "noop":
case "retry":
case "retryreset":
case "delay":
case "poll":
case "limit":
@@ -1787,6 +1794,9 @@ func (obj *StmtResMeta) Unify(kind string) ([]interfaces.Invariant, error) {
case "retry":
invar = static(types.TypeInt)
case "retryreset":
invar = static(types.TypeBool)
case "delay":
invar = static(types.TypeInt)
@@ -1837,7 +1847,7 @@ func (obj *StmtResMeta) Unify(kind string) ([]interfaces.Invariant, error) {
// FIXME: allow partial subsets of this struct, and in any order
// FIXME: we might need an updated unification engine to do this
wrap := func(reverse *types.Type) *types.Type {
return types.NewType(fmt.Sprintf("struct{noop bool; retry int; delay int; poll int; limit float; burst int; reset bool; sema []str; rewatch bool; realize bool; reverse %s; autoedge bool; autogroup bool}", reverse.String()))
return types.NewType(fmt.Sprintf("struct{noop bool; retry int; retryreset bool; delay int; poll int; limit float; burst int; reset bool; sema []str; rewatch bool; realize bool; reverse %s; autoedge bool; autogroup bool}", reverse.String()))
}
ors := []interfaces.Invariant{}
invarBool := static(wrap(types.TypeBool))