Avoid canary deploy timeouts when proxy autostop overlaps an update - #5106
Draft
tomr-a5 wants to merge 4 commits into
Draft
Avoid canary deploy timeouts when proxy autostop overlaps an update#5106tomr-a5 wants to merge 4 commits into
tomr-a5 wants to merge 4 commits into
Conversation
tomr-a5
force-pushed
the
tom/reconcile-canary-target-state
branch
from
August 21, 2026 18:46
6c67f9e to
3071d2a
Compare
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.
Change Summary
What and Why:
When proxy autostop overlaps a canary Machine update, flyd can intentionally leave the replacement stopped while flyctl waits for it to start. The deploy then times out even though the update completed in the state selected by the Machine lifecycle.
How:
For canary updates of existing Machines whose request intended a launch, flyctl now honors the optional stopped target returned by Flaps. It waits for the exact returned Machine instance to settle stopped, then skips only the smoke, test-Machine, and health checks that require a started Machine. Explicit
skip_launch, new creates, rolling deployments, unknown target states, and older servers retain their existing behavior, and the recovery planner's pre-deploy launch intent remains stable across retries.Focused normal and race tests cover the legacy and recovery deployment lanes, the excluded modes, and the exact
instance_idsent as the Flaps wait-version query.Related to:
Documentation