fix: race condition in auto-scaler during Caddy config reload#2318
Merged
fix: race condition in auto-scaler during Caddy config reload#2318
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes a data race during Caddy config reloads by avoiding direct reads of the global mainThread from autoscaler goroutines.
Changes:
- Introduces
scalingDoneandscalingStateglobals intended to capturemainThread.done/mainThread.stateatinitAutoScalingtime. - Updates
scaleWorkerThreadandscaleRegularThreadto use the captured references instead ofmainThread.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Contributor
Author
|
Patch updated |
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 2 out of 2 changed files in this pull request and generated no new comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
dunglas
reviewed
Mar 28, 2026
Member
|
Thanks! |
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.
Spotted by a failing job on #2287
scaleWorkerThreadandscaleRegularThreadread the globalmainThreadfrom goroutines started byinitAutoScaling. During a Caddy reload,FrankenPHPApp.Start()callsShutdown()thenInit(), which overwritesmainThread. The scaler goroutines could read the stale global concurrently with the write.The fix captures
mainThread.doneandmainThread.statelocally ininitAutoScalingand passes them as parameters throughstartUpscalingThreads→scaleWorkerThread/scaleRegularThread. No package-level globals for these values — each autoscaler generation uses its own captured references, eliminating the race even during concurrent reloads.