ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-11 16:09:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

+test-live-and-pinned-triangle: don't promote pinned builds.

Browse Source
This commit is contained in:
Elliot Glaysher 2018-04-24 14:44:41 -07:00
parent a3d0bd0d22
commit 9444811d38
2 changed files with 83 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gen/ford-turbo.hoon
View File

@ -25,7 +25,7 @@
test-live-two-deep
test-live-three-deep
test-live-triangle
:: test-live-and-pinned-triangle
test-live-and-pinned-triangle
test-slim
test-ride
test-ride-scry-succeed
@ -340,7 +340,6 @@
::
=/ ford (ford-turbo now=~1234.5.6 eny=0xdead.beef scry=scry-42)
::
~& %first-----first
=^ moves ford
%- call:ford
:* duct=~[/first] type=~ %make ~nul
@ -358,7 +357,6 @@
`[%mult [%da ~1234.5.6] (sy [%x /foo/bar]~)]
== ==
::
~& %second-----second
=. ford (ford now=~1234.5.7 eny=0xdead.beef scry=scry-is-forbidden)
::
=^ moves2 ford
@ -374,7 +372,6 @@
[%scry %noun !>(42)]
== ==
::
~& %third-----third
=. ford (ford now=~1234.5.8 eny=0xdead.beef scry=scry-is-forbidden)
::
=^ moves3 ford (call:ford [duct=~[/first] type=~ %kill ~nul])
@ -383,7 +380,6 @@
%- expect-eq !>
[moves3 ~]
::
~& %fourth-----fourth
=^ moves4 ford (call:ford [duct=~[/second] type=~ %kill ~nul])
::
%+ welp
@ -799,8 +795,8 @@
(my [~nul *ford-state:ford-turbo]~)
:: like +test-live-triangle, but with another pinned build
::
:: Ensures that we deal with an orphaned provisional build which is used
:: by another build.
:: Ensures that we deal with various issues with live builds which
:: were partially pinned and their interaction with other live builds.
::
++ test-live-and-pinned-triangle
~& %test-live-and-pinned-triangle
@ -814,9 +810,6 @@
::
:- [%cx [[~nul %desk %da ~1234.5.7] /bar/foo]]
[%noun scry-type %it-does-in-fact-matter]
::
:- [%cx [[~nul %desk %da ~1234.5.8] /bar/foo]]
[%noun !>(%changed)]
==
::
=/ scry (scry-with-results scry-results)
@ -831,7 +824,6 @@
::
=/ static=schematic:ford [%same [%pin ~1234.5.6 autocons]]
::
~& %first--------first
=^ moves ford (call:ford [duct=~[/static] type=~ %make ~nul static])
::
%+ welp
@ -843,7 +835,6 @@
[%result [%scry %noun scry-type %it-does-in-fact-matter]]
== ==
::
~& %second--------second
=. ford (ford now=~1234.5.7 eny=0xbeef.dead scry=scry)
::
=^ moves2 ford (call:ford [duct=~[/autocons] type=~ %make ~nul autocons])
@ -859,8 +850,30 @@
%c %warp [~nul ~nul] %desk
`[%mult [%da ~1234.5.7] (sy [%x /foo/bar] ~)]
== ==
:: ~& [%state (~(got by state-by-ship.+>+<.ford) ~nul)]
`wall`~
::
=. ford (ford now=~1234.5.8 eny=0xbeef.dead scry=scry-is-forbidden)
::
=^ moves3 ford (call:ford [duct=~[/static] type=~ %kill ~nul])
::
%+ welp
%- expect-eq !>
:- moves3
~
::
=. ford (ford now=~1234.5.8 eny=0xbeef.dead scry=scry-is-forbidden)
::
=^ moves4 ford (call:ford [duct=~[/autocons] type=~ %kill ~nul])
::
%+ welp
%- expect-eq !>
:- moves4
:~ :* duct=~ %pass wire=/~nul/clay-sub/~nul/desk
%c %warp [~nul ~nul] %desk ~
== ==
::
%- expect-eq !>
:- state-by-ship.+>+<.ford
(my [~nul *ford-state:ford-turbo]~)
::
++ test-slim
~& %test-slim

89
lib/ford-turbo.hoon
View File

@ -1411,8 +1411,6 @@
:: point to th new build. The new build has an old build and thus
:: never gets cleaned up.
::
~& [%cancel duct live (build-to-tape build)]
::
=. state (remove-listener-from-build [duct live] build)
::
(cleanup build)
@ -1594,6 +1592,13 @@
::
?: ?=(%tombstone -.u.old-cache-line)
..execute(next-builds.state (~(put in next-builds.state) build))
:: if any ancestors are pinned, we must rerun
::
:: We can't cleanly promote a once build to a live build because we
:: didn't register its dependencies in the live tracking system.
::
?: (has-pinned-client u.old-build)
..execute(next-builds.state (~(put in next-builds.state) build))
:: old-subs: sub-builds of :u.old-build
::
=/ old-subs=(list ^build)
@ -1633,6 +1638,7 @@
:: When we can't directly promote ourselves, we're going to rerun
:: our build. It's possible that the sub-builds are different, in
:: which case we'll need to clean up the current sub-build dependency.
::
=. provisional-components.state
%+ roll `(list ^build)`new-subs
|= [new-sub=^build provisional-components=_provisional-components.state]
@ -1679,7 +1685,6 @@
++ promote-build
|= [old-build=build date=@da]
^- [(unit build) _..execute]
~& [%promote-build (build-to-tape old-build) date]
::
=^ old-cache-line results.state (access-cache old-build)
::
@ -1692,8 +1697,6 @@
=. rebuilds.state (link-rebuilds old-build new-build)
::
=? latest-by-disc.state
:: TODO: this isn't right; we can be promoting a non-live result to a live result.
::
?& ?=(%scry -.schematic.old-build)
=/ disc (extract-disc dependency.schematic.old-build)
~| disc+disc
@ -1777,7 +1780,9 @@
[~ ..execute]
:: if :next's result hasn't been wiped
::
?: ?=(%result -.u.next-result)
?: ?& ?=(%result -.u.next-result)
!(has-pinned-client u.next)
==
::
=. state (promote-live-listeners build u.next)
=. ..execute (cleanup build)
@ -1877,7 +1882,6 @@
::
?- -.result.made
%build-result
~& [%build-result (build-to-tape build.made)]
::
?> (~(has ju builds-by-date.state) date.build.made schematic.build.made)
::
@ -1901,7 +1905,12 @@
::
(access-cache u.previous-build)
::
=? state &(?=(^ previous-build) ?=(^ previous-result))
=? state
?& ?=(^ previous-build)
?=(^ previous-result)
:: this is wrong! it can be some other build that has the pin
!(has-pinned-client u.previous-build)
==
(promote-live-listeners u.previous-build build.made)
::
=. ..execute (send-mades build.made (root-once-listeners build.made))
@ -1909,7 +1918,9 @@
:: if result is same as previous, note sameness
::
=/ same-result=?
?& ?=([~ %result *] previous-result)
?& ?=(^ previous-build)
!(has-pinned-client u.previous-build)
?=([~ %result *] previous-result)
=(build-result.result.made build-result.u.previous-result)
==
::
@ -2054,7 +2065,6 @@
$(state-diffs t.state-diffs)
::
%blocks
~& [%blocks (build-to-tape build.made)]
=? moves
?=(^ scry-blocked.result.made)
::
@ -2089,6 +2099,15 @@
=. state
%+ roll builds.result.made
|= [block=build state=_state]
:: deal with block already being unblocked
::
:: If :block was run in the same batch as :build.made, and we've
:: already processed its result, then :build.made has already
:: been unblocked. Don't reblock ourselves since nothing will
:: unblock us.
::
?: (~(has by results.state) block)
state
::
%_ state
sub-builds.blocked-builds
@ -2694,21 +2713,7 @@
::
?: ?=(%pin -.schematic.build)
%.n
=/ has-pinned-client
:: iterate across all clients recursively, exiting early on %pin
::
=/ clients ~(tap in (~(get ju client-builds.components.state) build))
|-
?~ clients
%.n
?: ?=(%pin -.schematic.i.clients)
%.y
%_ $
clients
%+ weld t.clients
~(tap in (~(get ju client-builds.components.state) i.clients))
==
?: has-pinned-client
?: (has-pinned-client build)
%.n
:: check if :build has any live listeners
::
@ -2716,6 +2721,24 @@
?~ listeners
%.y
(lien `(list listener)`listeners is-listener-live)
:: +has-pinned-client: %.y if any of our ancestors are a %pin
::
++ has-pinned-client
|= =build
^- ?
:: iterate across all clients recursively, exiting early on %pin
::
=/ clients ~(tap in (~(get ju client-builds.components.state) build))
|-
?~ clients
%.n
?: ?=(%pin -.schematic.i.clients)
%.y
%_ $
clients
%+ weld t.clients
~(tap in (~(get ju client-builds.components.state) i.clients))
==
:: +access-cache: access the +cache-line for :build, updating :last-accessed
::
:: Usage:
@ -2847,15 +2870,15 @@
(~(has by old.rebuilds.state) build)
(~(has by listeners.state) build)
==
~& :* %cleanup-no-op
build=(build-to-tape build)
has-client-builds=(~(has by client-builds.components.state) build)
has-provisional=(~(has by client-builds.provisional-components.state) build)
has-old-rebuilds=(~(has by old.rebuilds.state) build)
listeners=(~(get by listeners.state) build)
==
:: ~& :* %cleanup-no-op
:: build=(build-to-tape build)
:: has-client-builds=(~(has by client-builds.components.state) build)
:: has-provisional=(~(has by client-builds.provisional-components.state) build)
:: has-old-rebuilds=(~(has by old.rebuilds.state) build)
:: listeners=(~(get by listeners.state) build)
:: ==
this
~& [%cleaning-up (build-to-tape build)]
:: ~& [%cleaning-up (build-to-tape build)]
:: remove :build from :state, starting with its cache line
::
=. results.state (~(del by results.state) build)