urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-20 09:21:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

migration: correcting take-migrate ship

Browse Source
This commit is contained in:
Hunter Miller 2022-11-30 15:20:11 -06:00
parent 0a555981cc
commit ec23cc5318
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/landscape/app/group-store.hoon
View File

@ -186,10 +186,11 @@
++ on-agent ++ on-agent
|= [=wire =sign:agent:gall] |= [=wire =sign:agent:gall]
^- (quip card _this) ^- (quip card _this)
~& src.bol
=^ cards state =^ cards state
?+ wire [- state]:(on-agent:def wire sign) ?+ wire [- state]:(on-agent:def wire sign)
[%pyre *] (take-pyre:gc t.wire sign) [%pyre *] (take-pyre:gc t.wire sign)
[%gladio @ ~] (take-migrate:gc sign) [%gladio @ ~] (take-migrate:gc (scot %p i.t.wire) sign)
:: ::
[%try-rejoin @ *] [%try-rejoin @ *]
?> ?=(%poke-ack -.sign) ?> ?=(%poke-ack -.sign)
@ -236,6 +237,7 @@
^- (quip card _state) ^- (quip card _state)
=^ cards-1=(list card) wait =^ cards-1=(list card) wait
~(migrate-start gladio bol) ~(migrate-start gladio bol)
~& wait
=/ cards-2=(list card) =/ cards-2=(list card)
%+ turn ~(tap in wait) %+ turn ~(tap in wait)
|= =ship |= =ship
@ -254,18 +256,18 @@
[%pass / %pyre leaf/"{<wire>} failed" u.p.sign]~ [%pass / %pyre leaf/"{<wire>} failed" u.p.sign]~
:: ::
++ take-migrate ++ take-migrate
|= =sign:agent:gall |= [=ship =sign:agent:gall]
^- (quip card _state) ^- (quip card _state)
~& migrating/src.bol ~& [migrating ship src.bol]
?: ?=(%poke-ack -.sign) ?: ?=(%poke-ack -.sign)
`state `state
:_ state(wait (~(del in wait) src.bol)) :_ state(wait (~(del in wait) ship))
^- (list card) ^- (list card)
%+ welp (~(migrate-ship gladio bol) src.bol) %+ welp (~(migrate-ship gladio bol) ship)
?: ?=(%kick -.sign) :: TODO: check queued watches don't get kicked ?: ?=(%kick -.sign) :: TODO: check queued watches don't get kicked
*(list card) *(list card)
:_ *(list card) :_ *(list card)
[%pass /gladio/(scot %p src.bol) %agent [src.bol %groups] %leave ~] [%pass /gladio/(scot %p ship) %agent [ship %groups] %leave ~]
:: ::
++ peek-group ++ peek-group
|= rid=resource |= rid=resource