Avoid deploy timeouts when proxy autostop overlaps a Machine update - #5128
Merged
Conversation
tomr-a5
force-pushed
the
tom/accept-preserved-stopped-update
branch
from
August 26, 2026 00:25
009d35e to
1deed7b
Compare
tomr-a5
force-pushed
the
tom/accept-preserved-stopped-update
branch
from
August 26, 2026 16:08
5021916 to
c0f810a
Compare
tomr-a5
force-pushed
the
tom/accept-preserved-stopped-update
branch
from
August 26, 2026 16:13
c0f810a to
0e5fe2a
Compare
tomr-a5
marked this pull request as ready for review
August 26, 2026 16:15
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:
Proxy autostop can finish during a canary or rolling Machine update. Flyd correctly leaves the replacement stopped, but flyctl keeps waiting for it to start until the deploy times out.
How:
Wait for both outcomes and accept stopped only when a fresh Machine read matches the exact updated instance and its newest lifecycle event confirms flyd preserved it. Ambiguous, scheduled, unsupported, and failed cases keep the existing behavior.
Tests cover the accepted stopped outcome and the fallback cases. The exact candidate also passed a development canary.
Related to:
Fixes superfly/machines-meta#8.
Documentation