Fix data race in Kubernetes StreamSession#61807
Merged
rosstimothy merged 1 commit intomasterfrom Nov 26, 2025
Merged
Conversation
The websocket used to communicate with Kubernetes was proctected by a mutex to prevent data races from concurrent writes. The mutex was however not being acquired when closing the session which could lead to data races since handling of various aspects of an interactive session are done in multiple goroutines. All existing direct calls to `WriteMessage` were replaced with the new `(SessionStream) write` function which serializes all writes as intended by acquiring the `writeSync` mutex. `(SessionStream) Close` was also reorganized to reduce indentation and return any errors that may be returned from closing the websocket. `SessionStream.closed` has been updated to atomic.Bool instead of an int32 that was accessed via the atomic.Int32 APIs.
greedy52
approved these changes
Nov 26, 2025
zmb3
approved these changes
Nov 26, 2025
public-teleport-github-review-bot
bot
removed the request for review
from bernardjkim
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
Contributor
|
@rosstimothy See the table below for backport results.
|
rosstimothy
added a commit
that referenced
this pull request
Nov 26, 2025
The websocket used to communicate with Kubernetes was proctected by a mutex to prevent data races from concurrent writes. The mutex was however not being acquired when closing the session which could lead to data races since handling of various aspects of an interactive session are done in multiple goroutines. All existing direct calls to `WriteMessage` were replaced with the new `(SessionStream) write` function which serializes all writes as intended by acquiring the `writeSync` mutex. `(SessionStream) Close` was also reorganized to reduce indentation and return any errors that may be returned from closing the websocket. `SessionStream.closed` has been updated to atomic.Bool instead of an int32 that was accessed via the atomic.Int32 APIs.
cthach
pushed a commit
that referenced
this pull request
Dec 1, 2025
The websocket used to communicate with Kubernetes was proctected by a mutex to prevent data races from concurrent writes. The mutex was however not being acquired when closing the session which could lead to data races since handling of various aspects of an interactive session are done in multiple goroutines. All existing direct calls to `WriteMessage` were replaced with the new `(SessionStream) write` function which serializes all writes as intended by acquiring the `writeSync` mutex. `(SessionStream) Close` was also reorganized to reduce indentation and return any errors that may be returned from closing the websocket. `SessionStream.closed` has been updated to atomic.Bool instead of an int32 that was accessed via the atomic.Int32 APIs.
github-merge-queue bot
pushed a commit
that referenced
this pull request
Dec 4, 2025
The websocket used to communicate with Kubernetes was proctected by a mutex to prevent data races from concurrent writes. The mutex was however not being acquired when closing the session which could lead to data races since handling of various aspects of an interactive session are done in multiple goroutines. All existing direct calls to `WriteMessage` were replaced with the new `(SessionStream) write` function which serializes all writes as intended by acquiring the `writeSync` mutex. `(SessionStream) Close` was also reorganized to reduce indentation and return any errors that may be returned from closing the websocket. `SessionStream.closed` has been updated to atomic.Bool instead of an int32 that was accessed via the atomic.Int32 APIs.
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.
The websocket used to communicate with Kubernetes was proctected by a mutex to prevent data races from concurrent writes. The mutex was however not being acquired when closing the session which could lead to data races since handling of various aspects of an interactive session are done in multiple goroutines.
All existing direct calls to
WriteMessagewere replaced with the new(SessionStream) writefunction which serializes all writes as intended by acquiring thewriteSyncmutex.(SessionStream) Closewas also reorganized to reduce indentation and return any errors that may be returned from closing the websocket.SessionStream.closedhas been updated to atomic.Bool instead of an int32 that was accessed via the atomic.Int32 APIs.changelog: Prevent data races when terminating interactive Kubernetes sessions