main
1// K concurrent writers on one repo, each editing its own file, retrying on cas_conflict.
2// Property: every edit lands exactly once, history is linear, the ref is a CAS chain, nothing else changes.
3import { test } from 'vitest';
4import assert from 'node:assert/strict';
5import { join } from 'node:path';
6import { mkdirSync } from 'node:fs';
7import { git, tmpRoot, makeBareRepo, startGitServer, commitFiles, fsckProblems, initRepo } from './server.js';
8import { editFile } from '../src/edit.js';
9import { Tracer, arrayExporter, flattenLine } from '../src/otel.js';
10import { unwrapAsync } from './unwrap.js';
12test('concurrent CAS writers converge; conflicts are observed and retried, never lost', async () => {
13 const { root, cleanup } = tmpRoot();
14 const srv = await startGitServer(root);
15 try {
16 const bare = makeBareRepo(root, 'cc');
17 const work = join(root, 'w'); mkdirSync(work); initRepo(work);
18 const K = 6, ROUNDS = 3;
19 const files = Object.fromEntries(Array.from({ length: K }, (_, i) => [`dir${i % 2}/f${i}.txt`, `v0 marker${i} end\n`]));
20 const base = commitFiles(work, bare, files, 'seed');
21 const exporter = arrayExporter();
22 const tracer = new Tracer({ exporter });
23 const attempts = [];
24 const writer = async i => {
25 const cache = new Map();
26 for (let r = 1; r <= ROUNDS; r++) {
27 for (let tries = 0; ; tries++) {
28 try {
29 const res = await unwrapAsync(editFile(`${srv.url}/cc.git`, { path: `dir${i % 2}/f${i}.txt`, find: `v${r - 1} marker${i}`, replace: `v${r} marker${i}`, author: { name: `w${i}`, email: `w${i}@x` }, message: `w${i} r${r}` }, { tracer, cache }));
30 attempts.push({ i, r, tries, ok: true, res }); break;
31 } catch (e) {
32 if (e.code !== 'cas_conflict') throw e;
33 attempts.push({ i, r, tries, ok: false });
34 if (tries > 50) throw new Error('livelock');
35 }
36 }
37 }
38 };
39 await Promise.all(Array.from({ length: K }, (_, i) => writer(i)));
40 // all edits landed
41 for (let i = 0; i < K; i++) assert.equal(git(bare, ['cat-file', '-p', `main:dir${i % 2}/f${i}.txt`]), `v${ROUNDS} marker${i} end\n`);
42 // linear history: exactly K*ROUNDS commits above base, each with one parent, each touching exactly one file
43 const log = git(bare, ['rev-list', '--first-parent', `${base}..main`]).trim().split('\n');
44 assert.equal(log.length, K * ROUNDS);
45 for (const c of log) {
46 assert.equal(git(bare, ['rev-list', '--parents', '-n1', c]).trim().split(' ').length, 2);
47 assert.equal(git(bare, ['diff-tree', '--no-commit-id', '--name-only', '-r', c]).trim().split('\n').length, 1);
48 }
49 assert.deepEqual(fsckProblems(bare), []); // losers' packs were unpacked before the CAS failed: dangling by design
50 // conflicts were real: with 6 writers racing, at least one cas_conflict must have occurred and been retried
51 // editFile redoes a cas_conflict once internally (attempt 1, span-linked); what the caller sees is only the conflicts
52 // that lost twice. Every lost CAS, internal or surfaced, is one failed receive-pack span and one failed git.edit root.
53 const surfaced = attempts.filter(a => !a.ok).length;
54 const spans = exporter.lines.flatMap(flattenLine);
55 const ngSpans = spans.filter(s => s.name === 'git.receive-pack' && s.attrs['git.push.ok'] === false);
56 const lostRoots = spans.filter(s => s.name === 'git.edit' && s.attrs['git.edit.outcome'] === 'cas_conflict');
57 const retried = spans.filter(s => s.name === 'git.edit' && s.attrs['git.edit.attempt'] === 1);
58 assert.equal(ngSpans.length, lostRoots.length, 'every lost CAS is a failed receive-pack span and a failed root');
59 assert.equal(retried.length, lostRoots.filter(s => s.attrs['git.edit.attempt'] === 0).length, 'every attempt-0 loss was retried once');
60 assert.ok(retried.every(s => s.links.length === 1), 'retries link to the attempt they retry');
61 assert.equal(surfaced, lostRoots.filter(s => s.attrs['git.edit.attempt'] === 1).length, 'callers see only double losses');
62 const conflicts = ngSpans.length;
63 assert.ok(ngSpans.every(s => /failed to update ref|fetch first|non-fast-forward|lock|incorrect old value provided/.test(s.attrs['git.push.ng.reason'])), ngSpans.map(s => s.attrs['git.push.ng.reason']).join('|'));
64 assert.ok(conflicts > 0, 'expected at least one CAS conflict under contention');
65 // successful pushes == landed commits
66 assert.equal(spans.filter(s => s.name === 'git.receive-pack' && s.attrs['git.push.ok'] === true).length, K * ROUNDS);
67 } finally { await srv.close(); cleanup(); }
68});
Diagnostics4 git calls · 338 ms
CallStatusSizeTime0338 ms
discover200152 B3 ms
git.upload-pack discover http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=ls-refs git.upstream.dur_ms=3 git.response.bytes=152 git.server.agent=gitty/1.0 git.server.object_format=sha1 git.server.caps=agent ls-refs fetch object-format git.server.fetch=shallow filter sideband-all git.protocol.version=2 git.pkt.frames=8 git.pkt.data=6 git.pkt.flush=2 git.pkt.delim=0 git.pkt.bytes=152 git.pkt.payload.max=34
ls-refs200145 B · hit3 ms
git.upload-pack ls-refs http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=ls-refs git.upstream.dur_ms=3 git.response.bytes=145 git.response.cache=HIT git.response.duration_ms=3 git.protocol.version=2 git.pkt.frames=3 git.pkt.data=2 git.pkt.flush=1 git.pkt.delim=0 git.pkt.bytes=145 git.pkt.payload.max=76 git.ls_refs.count=2 git.ls_refs.head=refs/heads/main
fetchblob:none · deepen 1020038 KiB · hit2 ms
git.upload-pack fetch http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch git.upstream.dur_ms=2 git.response.bytes=38434 git.response.cache=HIT git.response.duration_ms=2 git.fetch.filter=blob:none git.fetch.filter.requested=tree:0 git.fetch.filter.fallback=blob:none git.fetch.filter.learned=false git.fetch.wants=19912563f540228593df0c489082e5e2508e21e4 git.fetch.haves.count=0 git.fetch.deepen=10 git.fetch.thin_pack=false git.fetch.ofs_delta=true git.protocol.version=2 git.pkt.frames=6 git.pkt.data=4 git.pkt.flush=1 git.pkt.delim=1 git.pkt.bytes=38434 git.pkt.payload.max=38339 git.sideband.band1.bytes=38338 git.sideband.band2.bytes=0 git.sideband.band3.bytes=0 git.pack.objects=63 git.pack.bytes=38338 git.pack.ofs_delta=0 git.pack.ref_delta=8 git.pack.chain.max=8 git.pack.trailer=0bc36ab7adf82d3109177f11f1ea93f1ce071f77 git.pack.full=55Open pack map
fetch2001.8 KiB333 ms
git.upload-pack fetch http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch git.upstream.dur_ms=333 git.response.bytes=1882 git.response.cache=MISS git.response.duration_ms=333 git.fetch.wants=d5de3fda9f490694ec4c31c6d3cace3a48de0c4a git.fetch.haves.count=0 git.fetch.deepen=0 git.fetch.thin_pack=false git.fetch.ofs_delta=true git.protocol.version=2 git.pkt.frames=3 git.pkt.data=2 git.pkt.flush=1 git.pkt.delim=0 git.pkt.bytes=1882 git.pkt.payload.max=1861 git.sideband.band1.bytes=1860 git.sideband.band2.bytes=0 git.sideband.band3.bytes=0
Each row is one HTTP round trip ply made to the git server for this page, on one timeline. discover asks what the server speaks, ls-refs lists branch tips, fetch brings objects by id. A hit was served by Workers Cache. Tap a row for its wire details.
- Remote
- https://5ad2236b39de4c8bd8f6270ea63f3ea9.artifacts.cloudflare.net/git/public-v0/ply.git
- Ref
- refs/heads/main
- Commit
- 19912563f540228593df0c489082e5e2508e21e4
- cf-ray
- a5e2d304ff71cf3a
- Request
- 202157f5…
- Protocol
- v2 · sha1
- Agent
- gitty/1.0
- Filter
- advertised
- Fetch
- shallow filter sideband-all
- Capabilities
- agent ls-refs fetch object-format