clay: stop failed kelvin upgrades from retrying immediately

We were retrying failed kelvin upgrades as many times as we had apps
that needed to be suspended, because suspending an app triggers an
attempt to run the next kelvin upgrade.  This suspends all those apps in
one batch move, and then tries the next kelvin upgrade only once at the
end.

Fixes #6407

Partially addresses #6285
This commit is contained in:
Philip Monk 2023-03-23 15:46:33 -07:00 committed by pkova
parent 6e0985c9d1
commit 89500460f7
3 changed files with 19 additions and 7 deletions

View File

@ -583,15 +583,13 @@
..abet ..abet
=/ kel i.wic =/ kel i.wic
%- emil %- emil
=/ cards =/ desks=(list [=desk =zest])
%+ murn ~(tap by rock) %+ murn ~(tap by rock)
|= [=desk =zest wic=(set weft)] |= [=desk =zest wic=(set weft)]
?: |(=(%base desk) !?=(%live zest) (~(has in wic) kel)) ?: |(=(%base desk) !?=(%live zest) (~(has in wic) kel))
~ ~
`u=[%pass /kiln/bump/[desk] %arvo %c %zest desk %held] `u=[desk %held]
?~ cards [%pass /kiln/bump/zeal %arvo %c %zeal desks]~
[%pass /kiln/bump/wick %arvo %c %wick ~]~
cards
:: ::
++ poke-cancel ++ poke-cancel
|= a=@tas |= a=@tas

View File

@ -801,6 +801,7 @@
[%warp wer=ship rif=riff] :: internal file req [%warp wer=ship rif=riff] :: internal file req
[%werp who=ship wer=ship rif=riff-any] :: external file req [%werp who=ship wer=ship rif=riff-any] :: external file req
[%wick ~] :: try upgrade [%wick ~] :: try upgrade
[%zeal lit=(list [=desk =zest])] :: batch zest
[%zest des=desk liv=zest] :: live [%zest des=desk liv=zest] :: live
$>(%plea vane-task) :: ames request $>(%plea vane-task) :: ames request
== :: == ::

View File

@ -5018,9 +5018,22 @@
:: ::
%wick %wick
=^ mos ruf =^ mos ruf
=/ den ((de now rof hen ruf) our %base) abet:wick:((de now rof hen ruf) our %base) :: [wick]
abet:wick:den :: [wick]
[mos ..^$] [mos ..^$]
::
%zeal
=^ m1 ruf
=| mos=(list move)
|- ^+ [mos ruf]
?~ lit.req
[mos ruf]
=/ den ((de now rof hen ruf) our desk.i.lit.req)
=^ mos-new ruf abet:(set-zest:den zest.i.lit.req)
$(mos (weld mos mos-new), lit.req t.lit.req)
=^ m2 ruf
abet:wick:((de now rof hen ruf) our %base)
=^ m3 ruf abet:goad:(lu now rof hen ruf)
[:(weld m1 m2 m3) ..^$]
:: ::
%zest %zest
=^ m1 ruf =^ m1 ruf