Check if oldMachine is nil when updating process group#4180
Merged
Conversation
dangra
approved these changes
Jan 21, 2025
Contributor
|
I still don't love that I don't know why that is sometimes nil but this is a good defensive programming change anyway 🤷🏼 |
Lucais11
added a commit
that referenced
this pull request
May 27, 2026
When updateMachineWChecks returns an error for a scale-up pairing (oldMachine=nil), the error-formatting line dereferenced oldMachine.ID and panicked inside an errgroup goroutine, crashing the deploy. Use the locally-scoped machineID variable that already handles the nil-oldMachine case. The originally-reported panic in #4528 (at the now-removed healthChecksPassed.Load(machPair.oldMachine.ID) site) was patched in #4180; this closes the remaining oldMachine.ID deref in the same function. Sibling fix to #4750. Fixes #4528
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
3 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.
Change Summary
Sometimes, the oldMachine field in the MachineTuple during deploys is nil and we don't check for this when loading from the healthCheckPassed sync map.
flyctl/internal/command/deploy/plan.go
Line 151 in 26a778e
What and Why:
This fixes a panic that users occasionally encounter during deploy
How:
Related to:
Documentation