diff --git a/quest/m1/quic/README.md b/quest/m1/quic/README.md index e695a7e0041..caed9e0fbaf 100644 --- a/quest/m1/quic/README.md +++ b/quest/m1/quic/README.md @@ -20,15 +20,14 @@ One stack carries every change on MoQ's own QUIC paths; a build with the `iroh` feature also compiles upstream noq, and iroh connections are outside what these quests reach. -The seven BBR correctness fixes follow the fork bootstrap. They are separate -PRs, but one owner should work in the shared controller code at a time. +The seven BBR correctness fixes shipped in noq 1.3.1, ahead of the remaining +transport features. Their follow-ups are separate PRs, but one owner should +work in the shared controller code at a time. Their controller-level regressions extend the shared test `Sim` in `bbr3/mod.rs` with only what each needs, rather than adding another simulation loop; a fix at the transport boundary still needs a transport test through the real callbacks. The existing loops stay, since the fork -merges upstream weekly and a port would conflict. -The [BBR release](/quest/m1/quic/bbr-release.md) delivers them without waiting -for the remaining transport features. The +merges upstream weekly and a port would conflict. The [Google comparison](/quest/m2/quic-bbr-google.md) is a separate study. Rules the line keeps: @@ -51,7 +50,6 @@ This is a transport API change, not a MoQ wire change. ## Quests -- [Release BBR fixes](/quest/m1/quic/bbr-release.md) - publish and pin the corrected controller independently of later features - [Align BBR loss handling with draft-06](/quest/m1/quic/bbr-loss-parity.md) - losses use their own sample and undo re-enters ProbeUp through Refill - [Mark BBR starvation wherever the source runs dry](/quest/m1/quic/bbr-app-limited-edges.md) - partial polls count, local send caps do not, receiver credit is pinned - [Deliver the application close before io_uring teardown](/quest/m1/quic/uring-close.md) - diff --git a/quest/m1/quic/bbr-app-limited-edges.md b/quest/m1/quic/bbr-app-limited-edges.md index 58a62a00fab..5e866f981ce 100644 --- a/quest/m1/quic/bbr-app-limited-edges.md +++ b/quest/m1/quic/bbr-app-limited-edges.md @@ -29,11 +29,9 @@ when a transmit poll sends nothing. In moq-dev/noq Transport-boundary tests through the real callbacks: a partial poll that drains, a sender blocked only by `send_window`, and a stream blocked by -receiver credit. Stacks on the seven fixes' noq branches until they merge; -does not gate [the BBR release](/quest/m1/quic/bbr-release.md). No public +receiver credit. Builds on the released BBR fixes (noq 1.3.1). No public API or wire change is intended. ## Related -- [Release BBR fixes](/quest/m1/quic/bbr-release.md) - includes the first app-limited fix this extends - [BBR3 app-limited](/quest/m2/quic-bbr-app-limited.md) - measures natural draining on the corrected controller diff --git a/quest/m1/quic/bbr-loss-parity.md b/quest/m1/quic/bbr-loss-parity.md index 2bcee6f51f6..df00720d8f6 100644 --- a/quest/m1/quic/bbr-loss-parity.md +++ b/quest/m1/quic/bbr-loss-parity.md @@ -24,8 +24,7 @@ Two gaps remain after the seven correctness fixes, both in While in the file, move the remaining draft-05 links and renamed pseudocode identifiers (such as `probe_up_acked_per_inc`) to draft-06; comment-only. -This stacks on the seven fixes' noq branches until they merge, and does not -gate [the BBR release](/quest/m1/quic/bbr-release.md). Add a failing +This builds on the released BBR fixes (noq 1.3.1). Add a failing regression for each behavior on the shared test `Sim`: a loss before the first ACK sample, a loss between ACKs that must not alter the next ACK's sample, and a spurious-loss undo that passes through Refill. Internal only; @@ -33,5 +32,4 @@ no `Controller` or wire change. ## Related -- [Release BBR fixes](/quest/m1/quic/bbr-release.md) - the corrected baseline this builds on - [Upstream the fork](/quest/m1/quic/upstream.md) - offers this fix alongside the seven diff --git a/quest/m1/quic/bbr-release.md b/quest/m1/quic/bbr-release.md deleted file mode 100644 index 22ee73a5923..00000000000 --- a/quest/m1/quic/bbr-release.md +++ /dev/null @@ -1,113 +0,0 @@ -# [M] Release the BBR correctness fixes - -## Goal - -Published MoQ consumers receive the seven corrected BBR behaviors through -immutable releases of the noq fork and its adapters. Fixes do not wait for -qmux, stream scheduling, or other unrelated QUIC features. - -## Plan - -The fixes are merged in moq-dev/noq `main` and ship as 1.3.1 of -`moq-noq-proto`, `moq-noq-udp`, `moq-noq`, and `web-transport-moq`, which -share one version: - -- [moq-dev/noq#3](https://github.com/moq-dev/noq/pull/3) - BBR packet identity across QUIC spaces -- [moq-dev/noq#4](https://github.com/moq-dev/noq/pull/4) - each BBR ACK sample completes before the model uses it -- [moq-dev/noq#5](https://github.com/moq-dev/noq/pull/5) - the controller hears of application starvation before the next send -- [moq-dev/noq#6](https://github.com/moq-dev/noq/pull/6) - finished bandwidth probes age the max-bw window once and stop classifying losses as probe feedback -- [moq-dev/noq#7](https://github.com/moq-dev/noq/pull/7) - the first measured RTT replaces the 1ms estimate behind BBR's startup pacing rate -- [moq-dev/noq#8](https://github.com/moq-dev/noq/pull/8) - packets sent during ProbeRTT are application-limited, so its reduced rate cannot lower BBR's bandwidth model -- [moq-dev/noq#9](https://github.com/moq-dev/noq/pull/9) - a spurious loss episode restores the BBR model, window, and probe saved when the episode began - -[moq-dev/noq#10](https://github.com/moq-dev/noq/pull/10) prepares the -release. It bumps the version and internal pins, and adds `CHANGELOG-MOQ.md`, -which names the parent (n0-computer/noq `1a26a8b0`, unchanged since 1.3.0), -the carried set, and each change's upstream status. Upstream has only #7's -root, [n0-computer/noq#802](https://github.com/n0-computer/noq/pull/802) (open); -the rest go upstream with the [upstream quest](/quest/m1/quic/upstream.md). -The API change is additive (new `Controller` callbacks that default to the -deprecated ones they replace), and `cargo semver-checks` against 1.3.0 is -clean for all four crates. It ships as a patch so MoQ's `"1.3"` requirements -pick it up unchanged. - -Release steps, in order: - -1. Merge moq-dev/noq#10. -2. On crates.io, confirm all four crates list moq-dev/noq `moq-release.yml` - as a trusted publisher. `web-transport-moq` 1.3.0 was published apart from - the other three. -3. Tag the merge commit: `git tag v1.3.1 && git push origin v1.3.1`. - `moq-release` checks the tag against the workspace version and runs - `cargo publish --workspace`. -4. Here, `Cargo.toml` keeps `"1.3"`. Run - `cargo update -p moq-noq-proto -p moq-noq-udp -p moq-noq -p web-transport-moq`. - The lock then holds the four at registry 1.3.1, and - `cargo tree -d --workspace --all-features` shows no second copy. -5. Run `just check`, `just rs tokio-features`, - `cargo clippy --locked -p moq-tokio -p moq-uring -p moq-relay --all-targets --all-features -- -D warnings`, - `cargo nextest run --locked -p moq-tokio -p moq-uring -p moq-relay --all-features`, - and the media check below with release builds of `moq-relay` and - `moq-bench`. -6. The PR that lands the lockfile deletes this quest. It changes no - manifest, so the published `moq-tokio` and `moq-uring` still accept - 1.3.0. A new resolve picks 1.3.1, but a downstream lock that already has - 1.3.0 keeps it until `cargo update`. - -The media check sends one 4.8 Mbps track (30 fps, 20 kB frames, 1 s groups) -to two subscribers through `moq-relay` over QUIC with the default Delay -family (BBR). From the repository root, the loopback runs in a rootless -network namespace shaped by netem. The relay config is -`test/interop/interop.toml`: bind `127.0.0.1:4443`, `tls.generate`, public -auth, no iroh. The client disables the WebSocket fallback, since it wins the -race under loss, and the relay log must show three QUIC sessions and none -over WebSocket. - -`moq-bench` exits 0 whenever any group arrives, which the broken 1.3.0 -release still does. The shell keeps that exit status, so a successful `kill` -cannot hide a failed benchmark, and then refuses the 1.3.0 shape on this -path: under 60 MB received, p50 over 150 ms, or p99 over 400 ms. Those -cutoffs sit between the columns below. - -```bash -unshare -rn bash -c ' -ip link set lo up -tc qdisc add dev lo root netem delay 20ms loss 2% rate 40mbit -moq-relay test/interop/interop.toml & -sleep 1 -moq-bench --connect http://localhost:4443 --connect-websocket-enabled=false \ - --fanout media --connections 3 --startup 1s --duration 60s --report 5s \ - --fps 30 --frame-size 20000 --group-size 29 --output stats.jsonl -status=$? -kill %1 -exit "$status"' && -python3 -c ' -import json, sys -snap = json.loads(open("stats.jsonl", encoding="utf-8").read().splitlines()[-1]) -recv, p50, p99 = snap["bytes_recv"], snap["latency_p50_ms"], snap["latency_p99_ms"] -if recv < 60_000_000 or p50 > 150 or p99 > 400: - sys.exit(f"media check looks like 1.3.0, not 1.3.1: bytes_recv={recv} p50={p50} p99={p99}") -' -``` - -Repeat only the `unshare` with `delay 20ms loss 1% rate 16mbit`, just above -the offered load, and compare that run to the table. Do not reuse the python -cutoffs there: 1.3.0 already delivers most of the bytes and the latency -ranges overlap, so that row is a capacity check, not a pass/fail gate. - -Local runs against the fork through a `[patch.crates-io]` on -2026-09-25, two per cell, of about 71 MB offered: - -| Path | 1.3.0 received | 1.3.0 latency p50 / p99 | 1.3.1 received | 1.3.1 latency p50 / p99 | -|---|---|---|---|---| -| 2% loss, 40 Mbps | 23-26 MB | 241-340 / 916-1076 ms | 69 MB | 54-55 / 131-141 ms | -| 1% loss, 16 Mbps | 53-55 MB | 115-120 / 334-414 ms | 57-61 MB | 130-132 / 293-376 ms | - -The published crates are the same source, so a rerun against them should -match the 1.3.1 columns. The broader media-flow study and the Google comparison do not gate -these fixes. - -## Related - -- [Release the stack](/quest/m1/quic/release.md) - later feature releases follow the same packaging rules -- [BBR3 app-limited](/quest/m2/quic-bbr-app-limited.md) - broader media measurements after the corrected release diff --git a/quest/m1/quic/release.md b/quest/m1/quic/release.md index d2f38789327..fee1d41bdfc 100644 --- a/quest/m1/quic/release.md +++ b/quest/m1/quic/release.md @@ -24,8 +24,6 @@ the parent applies. ## Required -- [Release BBR fixes](/quest/m1/quic/bbr-release.md) - preserve the corrected controller in later stack releases - - [Reliable stream reset](/quest/m1/quic/reliable-reset.md) - the WebTransport-required transport extension - [Hierarchical stream scheduling](/quest/m1/quic/scheduler.md) - the new diff --git a/quest/m1/quic/upstream.md b/quest/m1/quic/upstream.md index 320c4d357d7..cca92d85f0a 100644 --- a/quest/m1/quic/upstream.md +++ b/quest/m1/quic/upstream.md @@ -15,7 +15,7 @@ lands in the fork on MoQ's schedule; once a feature has shipped in a MoQ release and its shape has stopped moving, split it into an upstream PR with the tests it landed with. -Offer the seven [BBR correctness fixes](/quest/m1/quic/bbr-release.md) and +Offer the seven BBR correctness fixes released in noq 1.3.1 and their [loss](/quest/m1/quic/bbr-loss-parity.md) and [starvation](/quest/m1/quic/bbr-app-limited-edges.md) follow-ups with their regressions before promoting BBR as the default. Reuse existing @@ -55,7 +55,6 @@ offered and answered. ## Required -- [Release BBR fixes](/quest/m1/quic/bbr-release.md) - the corrected controller and its regression evidence - [Align BBR loss handling with draft-06](/quest/m1/quic/bbr-loss-parity.md) - [Mark BBR starvation wherever the source runs dry](/quest/m1/quic/bbr-app-limited-edges.md) diff --git a/quest/m2/quic-bbr-app-limited.md b/quest/m2/quic-bbr-app-limited.md index d6b7a298464..561b4bea8bf 100644 --- a/quest/m2/quic-bbr-app-limited.md +++ b/quest/m2/quic-bbr-app-limited.md @@ -40,10 +40,6 @@ harness in CI, with broader network cases at least nightly, and a verdict with pinned sources/configurations. Any adopted production policy gets a separate implementation quest; this study does not silently change defaults. -## Required - -- [Release BBR fixes](/quest/m1/quic/bbr-release.md) - measure the corrected controller through MoQ's dependency chain - ## Related - [Discover media headroom](/quest/m2/quic-probe.md) - preserving an estimate and discovering spare capacity are separate problems diff --git a/quest/m2/quic-bbr-google.md b/quest/m2/quic-bbr-google.md index 869b3c8fa7f..92860467a26 100644 --- a/quest/m2/quic-bbr-google.md +++ b/quest/m2/quic-bbr-google.md @@ -34,10 +34,6 @@ not an end-to-end network measurement. Persist a reproducible harness in CI separate implementation quest for any adopted change rather than silently expanding this study into a controller rewrite. -## Required - -- [Release BBR fixes](/quest/m1/quic/bbr-release.md) - measure a baseline without the seven known defects - ## Related - [BBR3 app-limited](/quest/m2/quic-bbr-app-limited.md) - reuse media profiles and measurements diff --git a/quest/m2/quic-probe.md b/quest/m2/quic-probe.md index 5926256767a..cf9b17fe681 100644 --- a/quest/m2/quic-probe.md +++ b/quest/m2/quic-probe.md @@ -44,10 +44,6 @@ is not proof of full path capacity. Persist regressions in CI and broader network scenarios at least nightly. A measured no-go is a valid outcome; retain the baseline and record why before exposing an ineffective option. -## Required - -- [Release BBR fixes](/quest/m1/quic/bbr-release.md) - exclude known controller defects from the experiment - ## Related - [Natural media drains](/quest/m2/quic-bbr-app-limited.md) - separate ProbeRTT policy experiment