fix(session): prevent race condition in session cleanup#2503
Merged
dgageot merged 1 commit intodocker:mainfrom Apr 24, 2026
Merged
fix(session): prevent race condition in session cleanup#2503dgageot merged 1 commit intodocker:mainfrom
dgageot merged 1 commit intodocker:mainfrom
Conversation
Reorder deferred cleanup operations to ensure the streaming lock is released before the channel closes. This prevents a race where a caller draining the stream channel and immediately starting a new session could see `ErrSessionBusy` because the lock hadn't been released yet. Defers execute in LIFO order, so placing `streaming.Unlock` before `close(streamChan)` guarantees the lock is freed by the time the consumer's range loop terminates.
dgageot
approved these changes
Apr 24, 2026
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
2 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.
SessionManager.RunSessiondefersstreaming.Unlockfirst andclose(streamChan)last inside the background goroutine. Because defers run LIFO, close fires before Unlock, so a caller that drains the channel and immediately callsRunSessionagain can race the unlock and spuriously seeErrSessionBusy.Reorder the defers so
Unlockfires before close, making the channel-close the observable "session is idle" signal. Surfaced intermittently byTestRunSession_ConcurrentRequestReturnsErrSessionBusyin CI.