ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-15 01:52:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3911 from urbit/m/eyre-clog-cleaner

Browse Source 
eyre: clog exclusively for %facts
This commit is contained in:
fang 2020-11-11 00:19:31 +01:00 committed by GitHub
commit 21cfd10d6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/arvo/sys/vane/eyre.hoon
View File

@ -1504,11 +1504,13 @@
?~ channel
:_ state :_ ~
[duct %pass /flog %d %flog %crud %eyre-no-channel >id=channel-id< ~]
:: it's possible that this is a fact emitted directly alongside a fact
:: it's possible that this is a sign emitted directly alongside a fact
:: that triggered a clog & closed the subscription. in that case, just
:: drop the fact.
:: drop the sign.
:: poke-acks are not paired with subscriptions, so we can process them
:: regardless.
::
?: ?& ?=(%fact -.sign)
?: ?& !?=(%poke-ack -.sign)
!(~(has by subscriptions.u.channel) request-id)
==
[~ state]
@ -1547,10 +1549,10 @@
:: update channel's unacked counts, find out if clogged
::
=^ clogged unacked.u.channel
:: poke-acks are one-offs, don't apply clog logic to them.
:: only apply clog logic to facts.
:: and of course don't count events we can't send as unacked.
::
?: ?| ?=(%poke-ack -.sign)
?: ?| !?=(%fact -.sign)
?=(~ json)
==
[| unacked.u.channel]
@ -1567,6 +1569,10 @@
=* kicking |(clogged ?=(~ json))
=? moves kicking
:_ moves
::NOTE this shouldn't crash because we
:: - never fail to serialize subscriptionless signs (%poke-ack),
:: - only clog on %facts, which have a subscription associated,
:: - and already checked whether we still have that subscription.
=+ (~(got by subscriptions.u.channel) request-id)
:^ duct %pass
(subscription-wire channel-id request-id ship app)

6
pkg/arvo/tests/sys/vane/eyre.hoon
View File

@ -1853,7 +1853,7 @@
==
:: user gets sent multiple subscription results
::
=/ max=@ud (dec clog-threshold:eyre-gate)
=/ max=@ud clog-threshold:eyre-gate
=/ cur=@ud 0
|- =* loop-fact $
?. =(cur max)
@ -1895,7 +1895,7 @@
:- ~
%- as-octt:mimes:html
"""
id: {((d-co:co 1) clog-threshold:eyre-gate)}
id: {((d-co:co 1) +(clog-threshold:eyre-gate))}
data: \{"json":[1],"id":1,"response":"diff"}
@ -1913,7 +1913,7 @@
:- ~
%- as-octt:mimes:html
"""
id: {((d-co:co 1) +(clog-threshold:eyre-gate))}
id: {((d-co:co 1) (add 2 clog-threshold:eyre-gate))}
data: \{"id":1,"response":"quit"}