Repository navigation
feat(relay)!: report drain cuts and pending end reports #7858
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
d29e1d7
chore(quest): claim quest/m1/relay-drain-cuts.md
kixelated 91023d1
feat(relay)!: report drain cuts and pending end reports
kixelated fd84f41
refactor(relay): reuse test support for simulated drain tasks
kixelated c868e9c
refactor(relay): stamp admission completion at its source
kixelated 5a0e77b
Merge remote-tracking branch 'origin/main' into iterate/relay-drain-cuts
kixelated b9c0eba
quest land: merge tested base
f63464d
quest land: merge tested base
7392482
Merge base and preserve both moq-net migration notes
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Script executed:
rg -n 'activity\.enter\(|\.activity\(\)\.enter\(' rs/moq-tokio/src rs/moq-relay/src rs/moq-uring/src rs/moq-cli/srcRepository: moq-dev/moq
Length of output: 2372
Script executed:
Repository: moq-dev/moq
Length of output: 25332
Script executed:
Repository: moq-dev/moq
Length of output: 17059
Script executed:
Repository: moq-dev/moq
Length of output: 6352
Script executed:
Repository: moq-dev/moq
Length of output: 2943
Script executed:
Repository: moq-dev/moq
Length of output: 4797
Script executed:
Repository: moq-dev/moq
Length of output: 9278
Script executed:
Repository: moq-dev/moq
Length of output: 885
Script executed:
Repository: moq-dev/moq
Length of output: 3862
Refuse RTMP connections that have no admission.
After drain commits,
enter()returnsNone, so the listener passes the connection withadmission: None. The RTMP arm ofWebAcceptor::accepthands it to the embedder throughWeb::rtmp()without a check. Refuse it there, as the QUIC, WebSocket, and TCP paths already do.Suggested fix
crate::listener::Classified::Rtmp(stream) => { + // Closed for drain: refuse so no embedder serves an RTMP session after the commit. + if stream.admission().is_none() { + return Err(std::io::Error::other("refused an RTMP connection after drain")); + } this.rtmp.send(stream).await; return Err(std::io::Error::other("handed off an RTMP connection"));