Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion quest/m1/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ removed).

- [Resume checked against a model](/quest/m1/resume-model-test.md) - a randomized test checks every resumed reader against a one-track reference model in Rust and JS, and passes before the cut
- [Recover by the reader's budget](/quest/m1/recover-reader-budget.md) - resume judges a missing group by each reader's own budget, not the copy's
- [Rust resume release path](/quest/m1/resume-release-rust.md) - letting go of a replaced Rust copy never releases a group already moved to another
- [Slow joiner test](/quest/m1/slow-joiner-test.md) - a reader stalled before its first read loses no groups within its budget, under real stream backpressure
- [Address groups by timestamp](/quest/m1/time-addressing/README.md) - group start timestamps replace sequence numbers in the moq-net API and lite-07 wire, while old subscribers, old publishers, and published JS clients keep working
- [Release audit findings](/quest/m1/release-audit/README.md) - resolve newly identified resource, parser, playback, and interoperability risks before the cut
Expand Down
16 changes: 0 additions & 16 deletions quest/m1/resume-release-rust.md

This file was deleted.

51 changes: 51 additions & 0 deletions rs/moq-net/src/model/resume.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3933,6 +3933,57 @@ mod test {
}
}

/// A group handed out from a replaced copy, then moved to the serving copy once the
/// replaced route gave it up, reads on to its last frame after that copy is let go,
/// in either read order.
#[test]
#[cfg(feature = "async")]
fn a_moved_group_outlives_the_replaced_copy_it_was_handed_out_from() {
for ordered in [false, true] {
let routes = Producer::new();
let logical = logical(&routes);
let a = copy();
routes.serve(a.consume());
let mut sub = subscribe(&logical, HOUR);
let b = copy();
let dynamic = b.requests();
routes.serve(b.consume());

// The serving route has nothing yet, so group 8 comes from the replaced one.
let mut open = a.create_group(group::Info { sequence: 8 }).unwrap();
open.write_frame(ts(8), b"a".as_ref()).unwrap();
let res = match ordered {
true => sub.poll_next_group(&kio::Waiter::noop()),
false => sub.poll_recv_group(&kio::Waiter::noop()),
};
let Poll::Ready(Ok(Some(mut reading))) = res else {
panic!("expected group 8");
};
assert_eq!(reading.sequence, 8);
assert_eq!(read(&mut reading), Some(b"a".to_vec()));

// The replaced route gives it up, so the rest is fetched from the serving route.
open.abort(Error::Stream(StreamError::DeliveryTimeout)).unwrap();
assert!(reading.read_frame().now_or_never().is_none());
let request = dynamic.requested_fill_group().now_or_never().unwrap().unwrap();
assert_eq!((request.sequence(), request.frame_start()), (8, 1));
let mut rest = request.accept(None).unwrap();
assert!(reading.read_frame().now_or_never().is_none());

// The serving copy's first group bounds the replaced one, which is let go.
write(&b, 9);
assert_eq!(drain(&mut sub, ordered), [9]);
assert_eq!(copies(&routes), 1, "ordered={ordered}");

rest.write_frame(ts(9), b"b".as_ref()).unwrap();
rest.write_frame(ts(10), b"c".as_ref()).unwrap();
rest.finish().unwrap();
assert_eq!(read(&mut reading), Some(b"b".to_vec()), "ordered={ordered}");
assert_eq!(read(&mut reading), Some(b"c".to_vec()));
assert_eq!(read(&mut reading), None);
}
}

/// A group the new copy replays, already handed out, does not bound the replaced copy:
/// the old route's next group still arrives.
#[test]
Expand Down
Loading