diff --git a/quest/m0/release-22/README.md b/quest/m0/release-22/README.md index aec05f4475e..ad0eb1f8ebc 100644 --- a/quest/m0/release-22/README.md +++ b/quest/m0/release-22/README.md @@ -43,4 +43,3 @@ track's latest group lost after rejoin. - [Draft-20+ FETCH](/quest/m0/release-22/fetch.md) - backport #4971 so a draft-22 FETCH is served, not refused - [Unset host clock](/quest/m0/release-22/wall-clock-omit.md) - a publisher whose wall clock reads before 2020 omits the catalog clock instead of aborting the host -- [Quiet latest group](/quest/m0/release-22/quiet-edge.md) - a late subscriber to a quiet track gets its latest group after rejoin, cache expiry, or takeover diff --git a/quest/m0/release-22/quiet-edge.md b/quest/m0/release-22/quiet-edge.md deleted file mode 100644 index d294772a2f9..00000000000 --- a/quest/m0/release-22/quiet-edge.md +++ /dev/null @@ -1,42 +0,0 @@ -# [S] A quiet track's latest group survives rejoin on the 0.17 release line - -## Goal - -On a 0.17.x moq-relay, a late subscriber to a live but quiet track (such as -a catalog published once) receives its latest group after earlier readers -left and rejoined and the cache expiry passed, including across a publisher -takeover. - -## Plan - -Reported in [#5413](https://github.com/moq-dev/moq/issues/5413) against -moq-relay 0.17.3 / moq-net 0.3.11. Verified 2026-10-13: the reporter's -`rejoined_quiet_catalog_survives_cache_expiry` test fails on the -`moq-net-v0.3.11` tag and its port passes on `main`, where #4741 deleted the -warm-copy code (`WarmGroup`, `WarmCopy`, `TrackIo`) and readers read the -serving route's copy directly. - -Root cause on `release` (`rs/moq-net/src/model/origin.rs`): the cache exempts -only a live track's latest group from expiry. On re-splice, dropping the -`WarmCopy` finishes its track, so its latest group is demoted while -`io.head` still holds it as the live edge. The new upstream copy resumes -after it, so nothing re-sends it, and the pool expires it. `TrackIo::retire` -returns early on a finished held group, so takeover loses it the same way. - -Decided 2026-10-13 (maintainer): - -- Backport to `release` only; `main` gets [a regression test](/quest/m1/quiet-edge-test.md). -- Keep the `WarmCopy` alive and unfinished until the new copy delivers a - group newer than its edge, so the one existing rule (a live track's - latest is protected) covers it. Give `retire` the same treatment for a - finished held group. Preferred over the reporter's patch (`WarmGroup` - holding a `cache::Protection` released by `Step::Held`), which adds a - second protection path to keep in sync. Fall back to it only if keeping - the copy alive proves invasive. -- Land the reporter's test (Lite05/06, superseded group still expires) and a - takeover variant. -- Ships with the next 0.17 patch alongside [draft-20+ FETCH](/quest/m0/release-22/fetch.md). - -## Closes - -- [#5413](https://github.com/moq-dev/moq/issues/5413) - quiet catalog lost after reader rejoin and cache expiry diff --git a/quest/m1/quiet-edge-test.md b/quest/m1/quiet-edge-test.md index 65efa7f3be1..5a355b4579f 100644 --- a/quest/m1/quiet-edge-test.md +++ b/quest/m1/quiet-edge-test.md @@ -14,9 +14,11 @@ superseded group still expires. future origin rework from regressing. Decided 2026-10-13 (maintainer): land the port of the reporter's test plus a takeover variant, on lite-05, 06 and 07 and transport-19 and 22, using `moq_net_sim::test` time. Mention #5413 -without a closing keyword; the [release backport](/quest/m0/release-22/quiet-edge.md) -closes it. +without a closing keyword; the release backport +([#5430](https://github.com/moq-dev/moq/pull/5430)) closed it. -## Related - -- [Release backport](/quest/m0/release-22/quiet-edge.md) - the 0.17 fix this pins on `main` +Port #5430's takeover variant (`taken_over_quiet_catalog_survives_cache_expiry`). +On `release` it sleeps 100ms on the paused clock before dropping the old +upstream, because an equal-cost second route emits no announce update to wait +on. The `main` test should await a real signal that the replacement route +landed instead of that sleep.