urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-23 19:05:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6763 from urbit/yu/fix-state-migrations

Browse Source 
ames:  fix state migration in 412 after merging #6762
This commit is contained in:
Pyry Kovanen 2023-08-21 13:59:50 +03:00 committed by GitHub
commit 37bb2674b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 108 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/arvo/app/roller.hoon
View File

@ -363,7 +363,7 @@
++ state-0 ++ state-0
$: %0 $: %0
pending=(list pend-tx) pending=(list pend-tx)
sending=(tree [l1-tx-pointer send-tx]) sending=(tree [l1-tx-pointer old-send-tx-4])
finding=(map keccak ?(%confirmed %failed [=time l1-tx-pointer])) finding=(map keccak ?(%confirmed %failed [=time l1-tx-pointer]))
history=(map address:ethereum (tree hist-tx)) history=(map address:ethereum (tree hist-tx))
next-nonce=(unit @ud) next-nonce=(unit @ud)

186
pkg/arvo/sys/vane/ames.hoon
View File

@ -567,7 +567,7 @@
crypto-core=acru:ames crypto-core=acru:ames
=bug =bug
snub=[form=?(%allow %deny) ships=(set ship)] snub=[form=?(%allow %deny) ships=(set ship)]
cong=[msg=@ud mem=@ud] cong=[msg=_5 mem=_100.000]
dead=(unit [=duct =wire date=@da]) dead=(unit [=duct =wire date=@da])
== ==
:: ::
@ -596,7 +596,7 @@
route=(unit [direct=? =lane]) route=(unit [direct=? =lane])
=qos =qos
=ossuary =ossuary
snd=(map bone message-pump-state-15) snd=(map bone message-pump-state-16)
rcv=(map bone message-sink-state) rcv=(map bone message-sink-state)
nax=(set [=bone =message-num]) nax=(set [=bone =message-num])
heeds=(set duct) heeds=(set duct)
@ -629,7 +629,7 @@
route=(unit [direct=? =lane]) route=(unit [direct=? =lane])
=qos =qos
=ossuary =ossuary
snd=(map bone message-pump-state-15) snd=(map bone message-pump-state-16)
rcv=(map bone message-sink-state) rcv=(map bone message-sink-state)
nax=(set [=bone =message-num]) nax=(set [=bone =message-num])
heeds=(set duct) heeds=(set duct)
@ -688,7 +688,7 @@
route=(unit [direct=? =lane]) route=(unit [direct=? =lane])
=qos =qos
=ossuary =ossuary
snd=(map bone message-pump-state-15) snd=(map bone message-pump-state-16)
rcv=(map bone message-sink-state) rcv=(map bone message-sink-state)
nax=(set [=bone =message-num]) nax=(set [=bone =message-num])
heeds=(set duct) heeds=(set duct)
@ -751,7 +751,7 @@
route=(unit [direct=? =lane]) route=(unit [direct=? =lane])
=qos =qos
=ossuary =ossuary
snd=(map bone message-pump-state-15) snd=(map bone message-pump-state-16)
rcv=(map bone message-sink-state) rcv=(map bone message-sink-state)
nax=(set [=bone =message-num]) nax=(set [=bone =message-num])
heeds=(set duct) heeds=(set duct)
@ -817,7 +817,7 @@
route=(unit [direct=? =lane]) route=(unit [direct=? =lane])
=qos =qos
=ossuary =ossuary
snd=(map bone message-pump-state-15) snd=(map bone message-pump-state-16)
rcv=(map bone message-sink-state) rcv=(map bone message-sink-state)
nax=(set [=bone =message-num]) nax=(set [=bone =message-num])
heeds=(set duct) heeds=(set duct)
@ -835,7 +835,7 @@
num-received=@ud num-received=@ud
next-wake=(unit @da) next-wake=(unit @da)
listeners=(set duct) listeners=(set duct)
metrics=pump-metrics-15 metrics=pump-metrics-16
== ==
|% |%
:: +afx: polymorphic node type for finger trees :: +afx: polymorphic node type for finger trees
@ -1087,10 +1087,11 @@
-- --
-- --
:: ::
+$ ames-state-14 ames-state-15 +$ ames-state-14 ames-state-16
+$ ames-state-15 +$ ames-state-15 ames-state-16
$+ ames-state-15 +$ ames-state-16
$: peers=(map ship ship-state-15) $+ ames-state-16
$: peers=(map ship ship-state-16)
=unix=duct =unix=duct
=life =life
=rift =rift
@ -1099,31 +1100,30 @@
snub=[form=?(%allow %deny) ships=(set ship)] snub=[form=?(%allow %deny) ships=(set ship)]
cong=[msg=@ud mem=@ud] cong=[msg=@ud mem=@ud]
== ==
:: +$ ship-state-16
+$ ship-state-15 $+ ship-state-16
$+ ship-state-15
$% [%alien alien-agenda] $% [%alien alien-agenda]
[%known peer-state-15] [%known peer-state-16]
== ==
:: ::
+$ peer-state-15 +$ peer-state-16
$+ peer-state-15 $+ peer-state-16
$: azimuth-state $: azimuth-state
route=(unit [direct=? =lane]) route=(unit [direct=? =lane])
=qos =qos
=ossuary =ossuary
snd=(map bone message-pump-state-15) snd=(map bone message-pump-state-16)
rcv=(map bone message-sink-state) rcv=(map bone message-sink-state)
nax=(set [=bone =message-num]) nax=(set [=bone =message-num])
heeds=(set duct) heeds=(set duct)
closing=(set bone) closing=(set bone)
corked=(set bone) corked=(set bone)
keens=(map path keen-state-15) keens=(map path keen-state-16)
== ==
:: ::
+$ keen-state-14 keen-state-15 +$ keen-state-14 keen-state-16
+$ keen-state-15 +$ keen-state-16
$+ keen-state-15 $+ keen-state-16
$: wan=((mop @ud want) lte) $: wan=((mop @ud want) lte)
nex=(list want) nex=(list want)
hav=(list have) hav=(list have)
@ -1131,28 +1131,28 @@
num-received=@ud num-received=@ud
next-wake=(unit @da) next-wake=(unit @da)
listeners=(set duct) listeners=(set duct)
metrics=pump-metrics-15 metrics=pump-metrics-16
== ==
:: ::
+$ message-pump-state-15 +$ message-pump-state-16
$+ message-pump-state-15 $+ message-pump-state-16
$: current=_`message-num`1 $: current=_`message-num`1
next=_`message-num`1 next=_`message-num`1
unsent-messages=(qeu message-blob) unsent-messages=(qeu message-blob)
unsent-fragments=(list static-fragment) unsent-fragments=(list static-fragment)
queued-message-acks=(map message-num ack) queued-message-acks=(map message-num ack)
packet-pump-state=packet-pump-state-15 packet-pump-state=packet-pump-state-16
== ==
:: ::
+$ packet-pump-state-15 +$ packet-pump-state-16
$+ packet-pump-state-15 $+ packet-pump-state-16
$: next-wake=(unit @da) $: next-wake=(unit @da)
live=((mop live-packet-key live-packet-val) lte-packets) live=((mop live-packet-key live-packet-val) lte-packets)
metrics=pump-metrics-15 metrics=pump-metrics-16
== ==
:: ::
+$ pump-metrics-15 +$ pump-metrics-16
$+ pump-metrics-15 $+ pump-metrics-16
$: rto=_~s1 $: rto=_~s1
rtt=_~s1 rtt=_~s1
rttvar=_~s1 rttvar=_~s1
@ -1162,27 +1162,27 @@
counter=@ud counter=@ud
== ==
:: ::
+$ queued-event-11-and-15 +$ queued-event-11-and-16
$+ queued-event-11-and-15 $+ queued-event-11-and-16
$% [%call =duct wrapped-task=(hobo task-11-and-15)] $% [%call =duct wrapped-task=(hobo task-11-and-16)]
[%take =wire =duct =sign] [%take =wire =duct =sign]
== ==
:: ::
+$ task-11-and-15 +$ task-11-and-16
$+ task-11-and-15 $+ task-11-and-16
$% [%kroc dry=?] $% [%kroc dry=?]
[%snub ships=(list ship)] [%snub ships=(list ship)]
$<(?(%snub %kroc) task) $<(?(%snub %kroc) task)
== ==
:: ::
+$ queued-event-15 +$ queued-event-16
$+ queued-event-15 $+ queued-event-16
$% [%call =duct wrapped-task=(hobo task-15)] $% [%call =duct wrapped-task=(hobo task-16)]
[%take =wire =duct =sign] [%take =wire =duct =sign]
== ==
:: ::
+$ task-15 +$ task-16
$+ task-15 $+ task-16
$% [%kroc dry=?] $% [%kroc dry=?]
$<(%kroc task) $<(%kroc task)
== ==
@ -1332,7 +1332,8 @@
[%13 ames-state-13] [%13 ames-state-13]
[%14 ames-state-14] [%14 ames-state-14]
[%15 ames-state-15] [%15 ames-state-15]
[%16 ^ames-state] [%16 ames-state-16]
[%17 ^ames-state]
== ==
:: ::
|= [now=@da eny=@ rof=roof] |= [now=@da eny=@ rof=roof]
@ -1455,7 +1456,7 @@
:: lifecycle arms; mostly pass-throughs to the contained adult ames :: lifecycle arms; mostly pass-throughs to the contained adult ames
:: ::
++ scry scry:adult-core ++ scry scry:adult-core
++ stay [%16 %larva queued-events ames-state.adult-gate] ++ stay [%17 %larva queued-events ames-state.adult-gate]
++ load ++ load
|= $= old |= $= old
$% $: %4 $% $: %4
@ -1502,47 +1503,54 @@
== == == ==
$: %10 $: %10
$% $: %larva $% $: %larva
events=(qeu queued-event-11-and-15) events=(qeu queued-event-11-and-16)
state=ames-state-10 state=ames-state-10
== ==
[%adult state=ames-state-10] [%adult state=ames-state-10]
== == == ==
$: %11 $: %11
$% $: %larva $% $: %larva
events=(qeu queued-event-11-and-15) events=(qeu queued-event-11-and-16)
state=ames-state-11 state=ames-state-11
== ==
[%adult state=ames-state-11] [%adult state=ames-state-11]
== == == ==
$: %12 $: %12
$% $: %larva $% $: %larva
events=(qeu queued-event-15) events=(qeu queued-event-16)
state=ames-state-12 state=ames-state-12
== ==
[%adult state=ames-state-12] [%adult state=ames-state-12]
== == == ==
$: %13 $: %13
$% $: %larva $% $: %larva
events=(qeu queued-event-15) events=(qeu queued-event-16)
state=ames-state-13 state=ames-state-13
== ==
[%adult state=ames-state-13] [%adult state=ames-state-13]
== == == ==
$: %14 $: %14
$% $: %larva $% $: %larva
events=(qeu queued-event-15) events=(qeu queued-event-16)
state=ames-state-14 state=ames-state-14
== ==
[%adult state=ames-state-14] [%adult state=ames-state-14]
== == == ==
$: %15 $: %15
$% $: %larva $% $: %larva
events=(qeu queued-event-15) events=(qeu queued-event-16)
state=ames-state-15 state=ames-state-15
== ==
[%adult state=ames-state-15] [%adult state=ames-state-15]
== == == ==
$: %16 $: %16
$% $: %larva
events=(qeu queued-event-16)
state=ames-state-16
==
[%adult state=ames-state-16]
== ==
$: %17
$% $: %larva $% $: %larva
events=(qeu queued-event) events=(qeu queued-event)
state=_ames-state.adult-gate state=_ames-state.adult-gate
@ -1620,7 +1628,7 @@
[%10 %larva *] [%10 %larva *]
~> %slog.1^leaf/"ames: larva: load" ~> %slog.1^leaf/"ames: larva: load"
=. cached-state `[%10 state.old] =. cached-state `[%10 state.old]
=. queued-events (event-11-to-16 events.old) =. queued-events (event-11-to-17 events.old)
larval-gate larval-gate
:: ::
[%11 %adult *] [%11 %adult *]
@ -1631,7 +1639,7 @@
[%11 %larva *] [%11 %larva *]
~> %slog.1^leaf/"ames: larva: load" ~> %slog.1^leaf/"ames: larva: load"
=. cached-state `[%11 state.old] =. cached-state `[%11 state.old]
=. queued-events (event-11-to-16 events.old) =. queued-events (event-11-to-17 events.old)
larval-gate larval-gate
:: ::
[%12 %adult *] [%12 %adult *]
@ -1642,7 +1650,7 @@
[%12 %larva *] [%12 %larva *]
~> %slog.1^leaf/"ames: larva: load" ~> %slog.1^leaf/"ames: larva: load"
=. cached-state `[%12 state.old] =. cached-state `[%12 state.old]
=. queued-events (event-15-to-16 events.old) =. queued-events (event-16-to-17 events.old)
larval-gate larval-gate
:: ::
[%13 %adult *] [%13 %adult *]
@ -1653,7 +1661,7 @@
[%13 %larva *] [%13 %larva *]
~> %slog.1^leaf/"ames: larva: load" ~> %slog.1^leaf/"ames: larva: load"
=. cached-state `[%13 state.old] =. cached-state `[%13 state.old]
=. queued-events (event-15-to-16 events.old) =. queued-events (event-16-to-17 events.old)
larval-gate larval-gate
:: ::
[%14 %adult *] [%14 %adult *]
@ -1664,7 +1672,7 @@
[%14 %larva *] [%14 %larva *]
~> %slog.1^leaf/"ames: larva: load" ~> %slog.1^leaf/"ames: larva: load"
=. cached-state `[%14 state.old] =. cached-state `[%14 state.old]
=. queued-events (event-15-to-16 events.old) =. queued-events (event-16-to-17 events.old)
larval-gate larval-gate
:: ::
[%15 %adult *] [%15 %adult *]
@ -1675,15 +1683,26 @@
[%15 %larva *] [%15 %larva *]
~> %slog.1^leaf/"ames: larva: load" ~> %slog.1^leaf/"ames: larva: load"
=. cached-state `[%15 state.old] =. cached-state `[%15 state.old]
=. queued-events (event-15-to-16 events.old) =. queued-events (event-16-to-17 events.old)
larval-gate larval-gate
:: ::
[%16 %adult *] (load:adult-core %16 state.old) [%16 %adult *]
=. cached-state `[%16 state.old]
~> %slog.0^leaf/"ames: larva reload"
larval-gate
:: ::
[%16 %larva *] [%16 %larva *]
~> %slog.1^leaf/"ames: larva: load" ~> %slog.1^leaf/"ames: larva: load"
=. cached-state `[%16 state.old]
=. queued-events (event-16-to-17 events.old)
larval-gate
::
[%17 %adult *] (load:adult-core %17 state.old)
::
[%17 %larva *]
~> %slog.1^leaf/"ames: larva: load"
=. queued-events events.old =. queued-events events.old
=. adult-gate (load:adult-core %16 state.old) =. adult-gate (load:adult-core %17 state.old)
larval-gate larval-gate
== ==
:: ::
@ -1701,14 +1720,14 @@
wrapped-task ?.(?=(%snub -.task) task [%snub %deny ships.task]) wrapped-task ?.(?=(%snub -.task) task [%snub %deny ships.task])
== ==
:: ::
++ event-11-to-16 ++ event-11-to-17
|= events=(qeu queued-event-11-and-15) |= events=(qeu queued-event-11-and-16)
^- (qeu queued-event) ^- (qeu queued-event)
%- ~(rep in events) %- ~(rep in events)
|= [e=queued-event-11-and-15 q=(qeu queued-event)] |= [e=queued-event-11-and-16 q=(qeu queued-event)]
%- ~(put to q) ^- queued-event %- ~(put to q) ^- queued-event
?. ?=(%call -.e) e ?. ?=(%call -.e) e
=/ task=task-11-and-15 ((harden task-11-and-15) wrapped-task.e) =/ task=task-11-and-16 ((harden task-11-and-16) wrapped-task.e)
%= e %= e
wrapped-task wrapped-task
?+ -.task task ?+ -.task task
@ -1717,14 +1736,14 @@
== ==
== ==
:: ::
++ event-15-to-16 ++ event-16-to-17
|= events=(qeu queued-event-15) |= events=(qeu queued-event-16)
^- (qeu queued-event) ^- (qeu queued-event)
%- ~(rep in events) %- ~(rep in events)
|= [e=queued-event-15 q=(qeu queued-event)] |= [e=queued-event-16 q=(qeu queued-event)]
%- ~(put to q) ^- queued-event %- ~(put to q) ^- queued-event
?. ?=(%call -.e) e ?. ?=(%call -.e) e
=/ task=task-15 ((harden task-15) wrapped-task.e) =/ task=task-16 ((harden task-16) wrapped-task.e)
%= e %= e
wrapped-task ?.(?=(%kroc -.task) task [%kroc ~]) wrapped-task ?.(?=(%kroc -.task) task [%kroc ~])
== ==
@ -1758,12 +1777,14 @@
14+(state-13-to-14:load:adult-core +.u.cached-state) 14+(state-13-to-14:load:adult-core +.u.cached-state)
=? u.cached-state ?=(%14 -.u.cached-state) =? u.cached-state ?=(%14 -.u.cached-state)
15+(state-14-to-15:load:adult-core +.u.cached-state) 15+(state-14-to-15:load:adult-core +.u.cached-state)
=? u.cached-state ?=(%15 -.u.cached-state)
16+(state-15-to-16:load:adult-core +.u.cached-state)
=^ moz u.cached-state =^ moz u.cached-state
?. ?=(%15 -.u.cached-state) [~ u.cached-state] ?. ?=(%16 -.u.cached-state) [~ u.cached-state]
~> %slog.0^leaf/"ames: init dead flow consolidation timer" ~> %slog.0^leaf/"ames: init dead flow consolidation timer"
:- [[/ames]~ %pass /dead-flow %b %wait `@da`(add now ~m2)]~ :- [[/ames]~ %pass /dead-flow %b %wait `@da`(add now ~m2)]~
16+(state-15-to-16:load:adult-core +.u.cached-state) 17+(state-16-to-17:load:adult-core +.u.cached-state)
?> ?=(%16 -.u.cached-state) ?> ?=(%17 -.u.cached-state)
=. ames-state.adult-gate +.u.cached-state =. ames-state.adult-gate +.u.cached-state
[moz larval-core(cached-state ~)] [moz larval-core(cached-state ~)]
-- --
@ -4945,15 +4966,15 @@
[moves ames-gate] [moves ames-gate]
:: +stay: extract state before reload :: +stay: extract state before reload
:: ::
++ stay [%16 %adult ames-state] ++ stay [%17 %adult ames-state]
:: +load: load in old state after reload :: +load: load in old state after reload
:: ::
++ load ++ load
=< |= $= old-state =< |= $= old-state
$% [%16 ^ames-state] $% [%17 ^ames-state]
== ==
^+ ames-gate ^+ ames-gate
?> ?=(%16 -.old-state) ?> ?=(%17 -.old-state)
ames-gate(ames-state +.old-state) ames-gate(ames-state +.old-state)
:: all state transitions are called from larval ames :: all state transitions are called from larval ames
:: ::
@ -4969,7 +4990,7 @@
ship-state ship-state
=. snd.ship-state =. snd.ship-state
%- ~(run by snd.ship-state) %- ~(run by snd.ship-state)
|= pump=message-pump-state-15 |= pump=message-pump-state-16
=. num-live.metrics.packet-pump-state.pump =. num-live.metrics.packet-pump-state.pump
~(wyt in live.packet-pump-state.pump) ~(wyt in live.packet-pump-state.pump)
pump pump
@ -5124,33 +5145,40 @@
:: ::
++ state-15-to-16 ++ state-15-to-16
|= old=ames-state-15 |= old=ames-state-15
^- ames-state-16
:: re-initialize default congestion control values, if bunted
::
old(cong ?.(=(cong.old [0 0]) cong.old [5 100.000]))
::
++ state-16-to-17
|= old=ames-state-16
^- ^ames-state ^- ^ames-state
%= old %= old
cong [cong.old `[~[/ames] /dead-flow `@da`(add now ~m2)]] cong [cong.old `[~[/ames] /dead-flow `@da`(add now ~m2)]]
:: ::
peers peers
%- ~(run by peers.old) %- ~(run by peers.old)
|= ship-state=ship-state-15 |= ship-state=ship-state-16
^- ^ship-state ^- ^ship-state
?. ?=(%known -.ship-state) ?. ?=(%known -.ship-state)
ship-state ship-state
|^ |^
%= ship-state %= ship-state
snd (~(run by snd.ship-state) message-pump-15-to-16) snd (~(run by snd.ship-state) message-pump-16-to-17)
keens (~(run by keens.ship-state) keen-state-15-to-16) keens (~(run by keens.ship-state) keen-state-16-to-17)
rcv (~(rut by rcv.ship-state) remove-outbound-naxplanations) rcv (~(rut by rcv.ship-state) remove-outbound-naxplanations)
== ==
:: ::
++ message-pump-15-to-16 ++ message-pump-16-to-17
|= pump=message-pump-state-15 |= pump=message-pump-state-16
^- message-pump-state ^- message-pump-state
%= pump %= pump
metrics.packet-pump-state metrics.packet-pump-state
[rto rtt rttvar ssthresh cwnd counter]:metrics.packet-pump-state.pump [rto rtt rttvar ssthresh cwnd counter]:metrics.packet-pump-state.pump
== ==
:: ::
++ keen-state-15-to-16 ++ keen-state-16-to-17
|= keen-state=keen-state-15 |= keen-state=keen-state-16
^- ^keen-state ^- ^keen-state
%= keen-state %= keen-state
metrics [rto rtt rttvar ssthresh cwnd counter]:metrics.keen-state metrics [rto rtt rttvar ssthresh cwnd counter]:metrics.keen-state