[v15] Prevent deadlock on moderated sessions when mod connection drops#36916
Merged
tigrato merged 1 commit intobranch/v15from Jan 19, 2024
Merged
[v15] Prevent deadlock on moderated sessions when mod connection drops#36916tigrato merged 1 commit intobranch/v15from
tigrato merged 1 commit intobranch/v15from
Conversation
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>
codingllama
approved these changes
Jan 19, 2024
Comment on lines
+102
to
+105
| var toDelete []struct { | ||
| key string | ||
| err error | ||
| } |
Contributor
There was a problem hiding this comment.
Just for future reference, you can do something like this:
type deleteKey struct {
key string
err error
}
var toDelete []deleteKeyso you don't have to keep re-defining the struct everywhere.
flyinghermit
approved these changes
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.
Backport #36882 to branch/v15
changelog: Ensure that moderated sessions do not get stuck in the event of an unexpected drop in the moderator's connection.