ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2025-01-06 06:25:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6759 from urbit/yu/fix-ames-gall-desync

Browse Source 
gall: send %cork only if hearing %ack for %leave
This commit is contained in:
Pyry Kovanen 2023-10-09 15:52:50 +03:00 committed by GitHub
commit a667d85b8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 96 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
pkg/arvo/sys/vane/gall.hoon
View File

@ -42,9 +42,9 @@
:: $move: Arvo-level move
::
+$ move [=duct move=(wind note-arvo gift-arvo)]
:: $state-13: overall gall state, versioned
:: $state-15: overall gall state, versioned
::
+$ state-14 [%14 state]
+$ state-15 [%15 state]
:: $state: overall gall state
::
:: system-duct: TODO document
@ -53,6 +53,7 @@
:: yokes: running agents
:: blocked: moves to agents that haven't been started yet
:: bug: debug printing configuration
:: leaves: retry nacked %leaves timer, if set
::
+$ state
$: system-duct=duct
@ -61,6 +62,7 @@
yokes=(map term yoke)
blocked=(map term (qeu blocked-move))
=bug
leaves=(unit [=duct =wire date=@da])
==
:: $routes: new cuff; TODO: document
::
@ -162,13 +164,14 @@
:: $spore: structures for update, produced by +stay
::
+$ spore
$: %14
$: %15
system-duct=duct
outstanding=(map [wire duct] (qeu remote-request))
contacts=(set ship)
eggs=(map term egg)
blocked=(map term (qeu blocked-move))
=bug
leaves=(unit [=duct =wire date=@da])
==
:: $egg: migratory agent state; $yoke with .old-state instead of .agent
::
@ -192,7 +195,7 @@
--
:: adult gall vane interface, for type compatibility with pupa
::
=| state=state-14
=| state=state-15
|= [now=@da eny=@uvJ rof=roof]
=* gall-payload .
~% %gall-top ..part ~
@ -220,7 +223,8 @@
++ mo-core .
++ mo-abed |=(hun=duct mo-core(hen hun))
++ mo-abet [(flop moves) gall-payload]
++ mo-give |=(g=gift mo-core(moves [[hen give+g] moves]))
++ mo-emit |=(=move mo-core(moves [move moves]))
++ mo-give |=(=gift (mo-emit hen give+gift))
++ mo-talk
|= rup=(each suss tang)
^- [wire note-arvo]
@ -230,8 +234,8 @@
%& [%text "gall: {(t q)}ed %{(t p)}":[t=trip p.rup]]
%| [%talk leaf+"gall: failed" (flop p.rup)]
==
++ mo-pass |=(p=[wire note-arvo] mo-core(moves [[hen pass+p] moves]))
++ mo-slip |=(p=note-arvo mo-core(moves [[hen slip+p] moves]))
++ mo-pass |=(p=[wire note-arvo] (mo-emit hen pass+p))
++ mo-slip |=(p=note-arvo (mo-emit hen slip+p))
++ mo-past
|= =(list [wire note-arvo])
?~ list
@ -370,12 +374,8 @@
=. outstanding.state
=/ stand
(~(gut by outstanding.state) [wire hen] *(qeu remote-request))
%+ ~(put by outstanding.state) [wire hen]
(~(gas to stand) ?.(?=(%leave -.deal) ~[-.deal] ~[%leave]))
=. mo-core (mo-pass wire note-arvo)
?. ?=(%leave -.deal)
mo-core
(mo-pass wire [%a [%cork ship]])
(~(put by outstanding.state) [wire hen] (~(put to stand) -.deal))
(mo-pass wire note-arvo)
:: +mo-track-ship: subscribe to ames and jael for notices about .ship
::
++ mo-track-ship
@ -529,6 +529,10 @@
::
?+ sign-arvo !!
[%ames %done *]
=/ err=(unit tang)
?~ error=error.sign-arvo
~
`[[%leaf (trip tag.u.error)] tang.u.error]
=^ remote-request outstanding.state
?~ t.t.t.wire
=/ full-wire sys+wire
@ -545,29 +549,42 @@
=^ rr stand ~(get to stand)
:- rr
?: =(~ stand)
:: outstanding leaves are only deleted when acked
::
?: &(?=(^ err) ?=(%leave rr))
outstanding.state
(~(del by outstanding.state) [full-wire hen])
(~(put by outstanding.state) [full-wire hen] stand)
:: non-null case of wire is old, remove on next breach after
:: 2019/12
::
[;;(remote-request i.t.t.t.wire) outstanding.state]
::
=/ err=(unit tang)
?~ error=error.sign-arvo
~
`[[%leaf (trip tag.u.error)] tang.u.error]
:: send a %cork if we get a nack upon initial subscription
:: send a %cork if we get a %nack upon initial subscription
::
=? mo-core
&(?=(^ err) |(?=(%watch-as remote-request) ?=(%watch remote-request)))
(mo-pass [%sys wire] %a %cork ship)
(mo-pass sys+wire %a %cork ship)
::
?- remote-request
%watch-as (mo-give %unto %watch-ack err)
%watch (mo-give %unto %watch-ack err)
%poke (mo-give %unto %poke-ack err)
%leave mo-core
%missing ~>(%slog.[3 'gall: missing'] mo-core)
::
%leave
:: if we get an %ack for a %leave, send %cork. otherwise,
:: the /nacked-leaves timer will re-send the %leave eventually.
::
?~ err
(mo-pass sys+wire %a %cork ship)
:: if first time hearing a %nack for a %leave, after upgrade
:: or if all outstanding %leaves have been handled, set up timer
::
=? mo-core ?=(~ leaves.state)
(mo-emit [/gall]~ %pass /nacked-leaves %b %wait `@da`(add now ~m2))
=? leaves.state ?=(~ leaves.state)
`[[/gall]~ /nacked-leaves `@da`(add now ~m2)]
mo-core
==
::
[%ames %boon *]
@ -905,6 +922,13 @@
^+ mo-core
=. dudes.bug.state (sy dudes)
mo-core
::
++ mo-handle-nacked-leaves
|= =wire
^+ mo-core
?> ?=([%sys %way @ @ ~] wire)
(mo-pass wire %a %plea (slav %p &3.wire) %g /ge/[&4.wire] %0 %u ~)
::
:: +ap: agent engine
::
:: An inner, agent-level core. The sample refers to the agent we're
@ -1546,7 +1570,7 @@
++ on-bad-nonce
|= stored-nonce=@
%. ap-core
%- slog :~
%+ trace odd.veb.bug.state :~
=/ nonces [expected=stored-nonce got=nonce]
=/ ok |(?=(?(%fact %kick) -.sign) =(~ p.sign))
leaf+"{<agent-name>}: stale {<-.sign>} {<nonces>} ok={<ok>}"
@ -1955,18 +1979,37 @@
::
++ load
|^ |= old=spore-any
=? old ?=(%7 -.old) (spore-7-to-8 old)
=? old ?=(%8 -.old) (spore-8-to-9 old)
=? old ?=(%9 -.old) (spore-9-to-10 old)
=? old ?=(%7 -.old) (spore-7-to-8 old)
=? old ?=(%8 -.old) (spore-8-to-9 old)
=? old ?=(%9 -.old) (spore-9-to-10 old)
=? old ?=(%10 -.old) (spore-10-to-11 old)
=? old ?=(%11 -.old) (spore-11-to-12 old)
=? old ?=(%12 -.old) (spore-12-to-13 old)
=? old ?=(%13 -.old) (spore-13-to-14 old)
?> ?=(%14 -.old)
=? old ?=(%14 -.old) (spore-14-to-15 old)
?> ?=(%15 -.old)
gall-payload(state old)
::
+$ spore-any
$%(spore spore-7 spore-8 spore-9 spore-10 spore-11 spore-12 spore-13)
$% spore
spore-7
spore-8
spore-9
spore-10
spore-11
spore-12
spore-13
spore-14
==
+$ spore-14
$: %14
system-duct=duct
outstanding=(map [wire duct] (qeu remote-request))
contacts=(set ship)
eggs=(map term egg)
blocked=(map term (qeu blocked-move))
=bug
==
+$ spore-13
$: %13
system-duct=duct
@ -2185,9 +2228,10 @@
::
++ spore-13-to-14
|= old=spore-13
^- spore
^- spore-14
%= old
- %14
::
blocked
^- (map term (qeu blocked-move))
%- ~(run by blocked.old)
@ -2200,6 +2244,12 @@
attributing.routes [ship=attributing.routes.blocked path=/]
==
==
:: added nacked-leaves timer
::
++ spore-14-to-15
|= old=spore-14
^- spore
old(- %15, bug [bug.old ~])
--
:: +scry: standard scry
::
@ -2412,6 +2462,24 @@
=/ =gift ?>(?=([%behn %heck %gall *] syn) +>+.syn)
[[duct %give gift]~ gall-payload]
::
?: ?=([%nacked-leaves ~] wire)
=; core=_mo-core:mo
:: next time a %leave gets nacked, the state and timer will be set again.
::
mo-abet:core(leaves.state ~)
%- ~(rep by outstanding.state)
|= [[[=^wire =^duct] stand=(qeu remote-request)] core=_mo-core:mo]
?: =(~ stand) core
=^ rr stand ~(get to stand)
:: sanity check in the outstanding queue:
:: if there's a %leave, that should be the only request
::
~? >>> &(?=(%leave rr) =(^ stand))
"outstanding queue not empty [{<wire>} {<duct>} {<stand>}]"
=? core &(?=(%leave rr) =(~ stand))
(mo-handle-nacked-leaves:(mo-abed:core duct) wire)
core
::
~| [%gall-take-failed wire]
?> ?=([?(%sys %use) *] wire)
=< mo-abet