diff --git a/rs/moq-net/src/model/resume_model.rs b/rs/moq-net/src/model/resume_model.rs index dc20efe6c7d..57213445c3b 100644 --- a/rs/moq-net/src/model/resume_model.rs +++ b/rs/moq-net/src/model/resume_model.rs @@ -398,13 +398,13 @@ impl Model { if copy.complete(group) || !copy.given_up.insert(group) { return Ok(()); } - match copy.groups.get_mut(&group) { - Some(parts) => { - for writer in parts.iter_mut().filter_map(|part| part.writer.take()) { - let _ = writer.abort(Error::Stream(GIVE_UP)); - } - } - None => copy.track.drop_groups(group..group + 1, GIVE_UP), + let parts = copy.groups.get_mut(&group).map(Vec::as_mut_slice).unwrap_or_default(); + for writer in parts.iter_mut().filter_map(|part| part.writer.take()) { + let _ = writer.abort(Error::Stream(GIVE_UP)); + } + // A fetched tail is not the live feed's: the feed reports the group dropped. + if !parts.iter().any(|part| part.from == 0) { + copy.track.drop_groups(group..group + 1, GIVE_UP); } publisher.given_up.insert(group); } @@ -1364,6 +1364,46 @@ fn regressions() { ], finish: false, }, + // A route giving up a group it held only a fetched tail of drops it from its live + // feed, so an ordered read on that route moves past it. + Case { + ops: vec![ + Op::Up { instance: 1, slot: 0 }, + Op::Join { + reader: 1, + spec: spec(false, Budget::Hour, None, false), + }, + Op::Write { + instance: 1, + slot: 0, + group: None, + frames: 1, + }, + Op::Up { instance: 1, slot: 1 }, + Op::Join { + reader: 0, + spec: spec(true, Budget::Hour, None, false), + }, + Op::Write { + instance: 1, + slot: 0, + group: Some(5), + frames: 1, + }, + Op::Write { + instance: 1, + slot: 1, + group: None, + frames: 1, + }, + Op::GiveUp { + instance: 1, + slot: 1, + group: 5, + }, + ], + finish: false, + }, ]; for case in cases { if let Err(err) = run(&case) {