Fix crash during /reload from nil connection race condition#971
Merged
burningalchemist merged 1 commit intoburningalchemist:masterfrom Apr 10, 2026
Conversation
Owner
|
Hey @utafrali thank you for your contribution! 👍 Let me briefly review the PR, but overall looks good to me. 👏 |
Owner
|
I think there are several extra weak spots to address (e.g. we may want to introduce mutex over t.conn), but this can be improved separately. 👍 |
Owner
|
Hey @utafrali, I tested your fix, and still managed to reproduce the bug (hitting reloads and scraping /metrics at the same time for 1 million times seems a good test 😆). I added mutexes as I wanted earlier in #972, and it seems to survive the aggressive reloading/scraping. Just keeping you in the loop. 👍 |
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.
Fixes #970
Collectors were capturing t.conn directly in the goroutine closure, so if reload cleared the connection before the goroutine ran, it'd panic. Grabbing the connection value up front before spawning the goroutines avoids the race. Added a nil check in query.run() as a defensive measure too.