Fix SSH session WaitGroup race breaking master CI - #307
Merged
Conversation
proxySSHProcessIO was started in a goroutine alongside waitForProcess, so copyWG.Add raced with copyWG.Wait. Run the proxy setup synchronously so Adds complete before Wait, matching sync.WaitGroup rules. This was failing master CI on macos-15-intel in TestEmbeddedSSHServiceExecCurrentUser after the retry-test race fix. Co-authored-by: Dominic Letz <dominicletz@users.noreply.github.com>
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request modifies rpc/ssh_service.go to run proxySSHProcessIO synchronously instead of in a goroutine. This ensures that all copyWG.Add calls complete before waitForProcess calls Wait, preventing a potential data race. Relevant explanatory comments have also been added. There are no review comments, so I have no feedback to provide.
Important
The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.
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.
Summary
Master CI is still red after #306. The retry-test race is fixed, but the latest master run fails on
macos-15-intelwith a different data race in the embedded SSH session path.Root cause
In
handleSSHSessionStart, bothproxySSHProcessIOandwaitForProcesswere started as goroutines:proxySSHProcessIOcallscopyWG.Add(1)for stdout/stderr copy goroutineswaitForProcesscallscopyWG.Wait()after the process exitssync.WaitGroupforbids concurrentAddandWait, which-racecatches. The race also closed the SSH channel before output was fully copied, causingTestEmbeddedSSHServiceExecCurrentUserto see empty output.Fix
Run
proxySSHProcessIOsynchronously so allcopyWG.Addcalls complete beforewaitForProcessis started. Copy I/O still runs in background goroutines.CI context
033d081backoffclient_manager_retry_test.go(fixed by #306)d8c9d09#306 mergessh_service.go(this PR)Ubuntu/macOS-14/ARM already passed on the latest master run; Windows was cancelled due to fail-fast.
Verification
All passed locally after this change.