Skip to content
Merged
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
27 changes: 27 additions & 0 deletions rs/moq-net/src/model/resume.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1651,9 +1651,11 @@ impl Recover {
}
while self.route.poll_changed(self.generation, waiter).is_ready() {
// A route that returned serves the copy being read again, which the reader reuses.
// Closed routes stay ready forever, so they end the wait like a conclusion.
let route = self.route.state.read();
if route.end.is_some()
|| route.concluded
|| route.is_closed()
|| !route.copy.as_ref().is_some_and(|copy| copy.same_channel(&self.copy))
{
return true;
Expand Down Expand Up @@ -2481,6 +2483,31 @@ mod test {
);
}

/// Routes that close without concluding read like a conclusion: a reader stalled
/// mid-group parks on the copy it is reading rather than polling the closed routes
/// forever, and finishes the group from that copy.
#[moq_clock::test]
async fn a_stalled_group_parks_when_the_routes_close() {
let routes = Producer::new();
let logical = logical(&routes);
let a = copy();
routes.serve(a.consume());
let mut sub = subscribe(&logical, Duration::from_secs(10));

let mut open = a.create_group(group::Info { sequence: 0 }).unwrap();
open.write_frame(ts(0), b"a".as_ref()).unwrap();
let mut reading = recv(&mut sub);
assert_eq!(read(&mut reading), Some(b"a".to_vec()));

drop(routes);
assert!(reading.poll_read_frame(&kio::Waiter::noop()).is_pending());

open.write_frame(ts(1), b"b".as_ref()).unwrap();
assert_eq!(read(&mut reading), Some(b"b".to_vec()));
open.finish().unwrap();
assert_eq!(read(&mut reading), None);
}

/// A plain reader of a compressed group inflates from frame 0, so the replacement that
/// fetches only the rest adopts the failed route's compressed head.
#[test]
Expand Down
Loading