test: wait for transition goroutines to exit#2435
Merged
Merged
Conversation
TestTransitionThreadsWhileDoingRequests spawned transition goroutines that read mainThread.state via thread.shutdown(). isDone.Store(true) signalled them to stop but the test returned without waiting, so they could still be running when the next test's initPHPThreads wrote a fresh mainThread.state, producing a -race failure on macOS.
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes a race-prone test cleanup path by ensuring transition goroutines exit before the test returns and before global PHP thread state can be reinitialized by subsequent tests.
Changes:
- Adds a dedicated
sync.WaitGroupfor transition goroutines. - Marks each transition goroutine as done on exit.
- Waits for transition goroutines after signaling
isDone.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
AlliBalliBaba
approved these changes
May 18, 2026
Contributor
AlliBalliBaba
left a comment
AlliBalliBaba
left a comment
There was a problem hiding this comment.
Strange that this only is detected as race on mac.
henderkes
approved these changes
May 19, 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
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
TestTransitionThreadsWhileDoingRequestsspawned 10 transition goroutines that loop callingthread.shutdown()(which readsmainThread.stateat https://github.com/php/frankenphp/blob/main/phpthread.go#L133).isDone.Store(true)told them to stop, but the test returned without waiting, so a goroutine could still be insideshutdown()when the next test (TestFinishBootingAWorkerScript) calledinitPHPThreadsand wrote a freshmainThread.state— producing the macOS-racefailure seen in https://github.com/php/frankenphp/actions/runs/26035637665/job/76532863576.Tracked the transition goroutines with a
sync.WaitGroupand wait on it afterisDone.Store(true).