main
1// F34: same-file edit races must never surface as ambiguous (HTTP 502 via ply-web). One ok, rest cas_conflict.
2import { test } from 'vitest';
3import assert from 'node:assert/strict';
4import { join } from 'node:path';
5import { mkdirSync } from 'node:fs';
6import { git, tmpRoot, makeBareRepo, startGitServer, commitFiles, initRepo } from './server.js';
7import { editFile } from '../src/edit.js';
8import { Tracer } from '../src/otel.js';
9import { unwrapAsync } from './unwrap.js';
11test('same-file edit race ×1000 attempts: only ok and cas_conflict', async () => {
12 const { root, cleanup } = tmpRoot();
13 const srv = await startGitServer(root);
14 try {
15 const bare = makeBareRepo(root, 'f34');
16 const work = join(root, 'w'); mkdirSync(work); initRepo(work);
17 commitFiles(work, bare, { 'README.md': 'ply-edit-1\n' }, 'seed');
18 const url = `${srv.url}/f34.git`;
19 const TRIALS = 200;
20 const RACERS = 5;
21 const bad = [];
22 for (let trial = 0; trial < TRIALS; trial++) {
23 const tip = git(bare, ['rev-parse', 'main']).trim();
24 // find still matches once after prior winners (they keep the ply-edit-1\n prefix)
25 const results = await Promise.all(Array.from({ length: RACERS }, (_, i) =>
26 unwrapAsync(editFile(url, {
27 path: 'README.md', find: 'ply-edit-1\n', replace: `ply-edit-1\nrace-${trial}-${i}\n`,
28 author: { name: 'r', email: 'r@x' }, message: `t${trial}-${i}`,
29 }, { head: tip, strictHead: true, tracer: new Tracer() })).then(
30 () => ({ ok: true, code: null }),
31 e => ({ ok: false, code: e.code }),
32 )));
33 const nOk = results.filter(x => x.ok).length;
34 const nCas = results.filter(x => !x.ok && x.code === 'cas_conflict').length;
35 const other = results.filter(x => !x.ok && x.code !== 'cas_conflict');
36 if (nOk !== 1 || nCas !== RACERS - 1 || other.length) {
37 bad.push({ trial, nOk, nCas, other: other.map(o => o.code), codes: results.map(r => r.ok ? 'ok' : r.code) });
38 break;
39 }
40 }
41 assert.deepEqual(bad, [], JSON.stringify(bad.slice(0, 3)));
42 } finally {
43 await srv.close();
44 cleanup();
45 }
46}, 180_000);
Diagnostics4 git calls · 353 ms
CallStatusSizeTime0353 ms
discover200152 B3 ms
git.upload-pack discover http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch 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 · hit3 ms
git.upload-pack fetch http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch git.upstream.dur_ms=347 git.response.bytes=38434 git.response.cache=HIT git.response.duration_ms=3 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.1 KiB347 ms
git.upload-pack fetch http.response.status_code=200 git.response.bytes=1076 git.response.cache=MISS git.response.duration_ms=347 git.fetch.wants=0604c549dc846d6e99e6060164e561c8e9313126 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=1076 git.pkt.payload.max=1055 git.sideband.band1.bytes=1054 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
- a5e3386bffc824ce
- Request
- ba235e40…
- Protocol
- v2 · sha1
- Agent
- gitty/1.0
- Filter
- advertised
- Fetch
- shallow filter sideband-all
- Capabilities
- agent ls-refs fetch object-format