Prevent deadlock on moderated sessions when mod connection drops#36882
Merged
Prevent deadlock on moderated sessions when mod connection drops#36882
Conversation
Closed
codingllama
reviewed
Jan 18, 2024
Contributor
There was a problem hiding this comment.
Any change we could get a test for the deadlock?
Contributor
Author
There was a problem hiding this comment.
I would like to have but it's not that easy to have reproducible tests with this
codingllama
reviewed
Jan 18, 2024
codingllama
approved these changes
Jan 18, 2024
flyinghermit
approved these changes
Jan 18, 2024
This PR removes a deadlock caused by the moderator leaving the session because his connection drops. `OnWriteError` was called under lock which creates an issue if the function calls `Termnager.DeleteWriter` to exclude the writter from the term manager. This PR also correctly forwards errors to the clients when they occur. Changelog: Ensure that moderated sessions do not get stuck in the event of an unexpected drop in the moderator's connection. Fixes #36881 Signed-off-by: Tiago Silva <tiago.silva@goteleport.com>
tigrato
force-pushed
the
tigrato/fix-moderated-sessions-deadlock
branch
from
e778b86 to
5bb61d3
Compare
This was referenced Jan 19, 2024
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This PR removes a deadlock caused by the moderator leaving the session because his connection drops.
OnWriteErrorwas called under lock which creates an issue if the function callsTermnager.DeleteWriterto exclude the writer from the term manager.This PR also correctly forwards errors to the clients when they occur.
Changelog: Ensure that moderated sessions do not get stuck in the event of an unexpected drop in the moderator's connection.
Fixes #36881