Commit Graph

83 Commits

Author SHA1 Message Date
fang
b6bdd4fed6
Merge pull request #5286 from urbit/m/multi-type
docket: better glob upload handling
2021-10-12 23:47:57 +02:00
Jake Miller
ff81f00ec3
Merge branch 'release/next-userspace' into lf/grid-leap-ally 2021-10-06 18:10:43 -04:00
fang
e6d4f204d3
treaty: pr fixup 2021-10-06 21:15:38 +04:00
fang
d9267a62d8
treaty: whitespace 2021-10-06 21:15:17 +04:00
Liam Fitzgerald
cfb10b621c treaty: fixup subscriptions 2021-10-04 16:01:12 +10:00
fang
ef93dd88d2
docket: correctly en-vase a docket definition 2021-10-02 17:30:56 +02:00
fang
7ca810f2cf
docket: show error msgs earlier during glob upload
The error could mean that we don't have a valid `desk`. We want to show that
message, instead of trying to `(~(got by charges) desk)`.

Fixes #5282.
2021-10-01 15:25:38 +02:00
Fang
21d721c00f
docket: ignore absent docket file for kids 2021-09-29 23:20:58 +04:00
Liam Fitzgerald
029f839be5 treaty: prevent networking loops 2021-09-30 00:32:20 +10:00
Liam Fitzgerald
ebe5fe68ef various: update pills, jams, docket 2021-09-29 22:53:18 +10:00
Liam Fitzgerald
354f146cee settings-store: migrate to %landscape 2021-09-29 19:38:42 +10:00
Liam Fitzgerald
df7b6787a0 docket: fix broket |install 2021-09-29 18:33:00 +10:00
Liam Fitzgerald
a8c6030f0b various: disable verb-by-default 2021-09-29 14:48:27 +10:00
Liam Fitzgerald
d1c9b4cdf6 garden: fix app links 2021-09-29 13:27:28 +10:00
Fang
fba9fb4aad
docket: don't crash on receiving uninstall ack
We should've already deleted it from state by this point.
2021-09-29 00:49:44 +04:00
Fang
aa98a175ef
docket: write docket-0 to disk on-glob-upload 2021-09-29 00:38:32 +04:00
Ted Blackman
7eb08a1a40 docket: silence boring %base printf 2021-09-28 15:51:27 -04:00
Ted Blackman
5511cc95b5 docket,kiln: snapshot on %watch 2021-09-28 15:33:16 -04:00
Fang
1c90c0c9e7
docket: muh versioned marks 2021-09-28 23:22:06 +04:00
Fang
dca7742321
treaty: fix the other un-versioned mark instance 2021-09-28 22:59:47 +04:00
Fang
899aadf750
treaty: send treaty with the versioned mark 2021-09-28 22:33:40 +04:00
Hunter Miller
ce587b0c1e
Merge pull request #5260 from urbit/lf/fe-fixes
dist: FE fixes
2021-09-28 12:42:48 -05:00
Fang
e03ec03fc0
docket: set chad to %hung if glob hashes mismatch 2021-09-28 20:53:08 +04:00
Fang
8c368e639e
docket: always %leave previous fetch-glob
This just no-ops if it doesn't exist. If it does, we avoid the
duplicate-subscription-wire problem.
2021-09-28 20:52:19 +04:00
Fang
526e60b04c
strandio: fail when http request gets cancelled
Instead of waiting for a proper response. Iris doesn't currently retry!

Also updates docket to detect this case and retry appropriately.
2021-09-28 20:51:51 +04:00
Fang
d0091baa62
desk-jams: update
Also cleans docket back up.
2021-09-28 19:30:07 +04:00
Fang
6277213079
tmp: debug printfs 2021-09-28 18:30:12 +04:00
Fang
5cae9185f0
meta: fixup merge 2021-09-28 17:40:46 +04:00
Fang
400d2e4f44
Merge remote-tracking branch 'origin/lf/versioning-marks-dist' into dist 2021-09-28 17:13:33 +04:00
Liam Fitzgerald
8219f25093 garden: fix notification archival
Fixes urbit/landscape#1214
2021-09-28 14:32:38 +10:00
Liam Fitzgerald
77f7b05939 kiln: version external marks 2021-09-28 12:50:45 +10:00
Liam Fitzgerald
f3f13b1261 garden: version treaty, docket 2021-09-28 12:50:45 +10:00
ryjm
472f16fd2e garden spider: address comments 2021-09-27 21:23:46 -04:00
ryjm
ddf9e769ae spider, docket: move back to threads 2021-09-27 21:23:46 -04:00
Fang
4785dbbee5
docket: %leave glob subscriptions if necessary
If we're about to re-%watch on the same wire, we need to %leave first to
avoid getting into a duplicate wire situation.
2021-09-27 23:57:39 +04:00
Ted Blackman
7665e75849 manual merge @liam-fitzgerald misc. fixes PR 2021-09-27 14:50:58 -04:00
Fang
09c74dbaff
docket: fix "do we have this glob yet" check
We were incorrectly assuming we were comparing against a unit value.

Also makes a ~| more useful.
2021-09-26 21:55:22 +04:00
Fang
131cd82fc8
docket: include hash and target in glob wires
To avoid running into "duplicate wire" situations when we're just trying
to request the latest thing.

Additionally now does hash validation on http globs, and just silently
no-ops if the result we got came from a previous request.
2021-09-26 21:53:13 +04:00
Fang
2836fbde50
docket: better hash mismatch output
Could be useful to know both hashes when a mismatch happens.
2021-09-26 12:49:27 +04:00
Fang
cf73edb73c
docket: don't crash on adding a brand new docket
If we didn't have a charge for it yet, adding its new docket would
previously fail. Here we make sure this doesn't crash.

The local install case was hitting this.
2021-09-25 18:27:14 +04:00
Liam Fitzgerald
4267f69e3c hark: cleanup edges 2021-09-24 11:10:02 +10:00
Liam Fitzgerald
5dadee5375 Merge remote-tracking branch 'origin/dist' into m/dist-ames-glob-fixes 2021-09-23 15:50:55 +10:00
Liam Fitzgerald
b0f6f59b01 docket: move hash outside buccen 2021-09-23 15:45:13 +10:00
Liam Fitzgerald
7b262c78ce docket: remove index.html caching 2021-09-22 10:11:31 +10:00
Fang
514c54b46e
docket: change chad to %hung if glob watch fails 2021-09-21 19:28:52 +02:00
Fang
b41aaf8f10
docket: stop eating fresh globs and their hashes
When we uploaded a glob we hosted, we'd write a new docket to clay,
triggering a %commit.
The handling of this would:
- fail to update the docket in state,
- and discard our new glob, because the docket had changed.

Here we properly update the docket mirror in state, and make sure to
keep the glob around if its hash lines up.
2021-09-21 18:19:38 +02:00
Fang
75cc6aa28a
docket: add explicit hash to http globs 2021-09-21 17:52:45 +02:00
Fang
f1bb35fcee
docket: update docket file's glob hash on upload
If the docket says the glob is a local ames glob, then update the hash
to match the newly uploaded glob.

One would naively expect this to result in a %commit fact being
received, letting us update our state through the usual mechanism.
This is, for some reason, not the case...
2021-09-21 17:42:45 +02:00
Fang
4e453a9051
docket: hash-based glob-ames, handle within app
Instead of going through the thread. This works around a mark
definition issue and lets the docket file be more precise about
version selection. (Though older globs likely won't be kept around.)
2021-09-21 16:18:41 +02:00
Fang
976a071e5c
docket: stub out only glob _data_ in dbug state
And make it (hopefully) more obvious that it's getting stubbed out.
2021-09-21 16:17:53 +02:00