Fix wake recovery after snapshot restore timeout - #87
Open
fcasal wants to merge 2 commits into
Open
Conversation
fcasal
force-pushed
the
fix/wake-timeout-recovery
branch
from
September 8, 2026 12:12
6ef280e to
c1757c8
Compare
ret2libc
reviewed
Sep 8, 2026
ret2libc
left a comment
Collaborator
There was a problem hiding this comment.
Resuming an existing droplet can break its working SSH configuration. For example:
- wake finishes Tailscale setup, updates SSH config to the Tailscale IP, and blocks public SSH through firewall lockdown.
- The user interrupts at the snapshot-deletion prompt, leaving the snapshot available.
- On retry, this PR accepts the existing droplet, but the code below overwrites its SSH entry with the public IP.
- Tailscale setup then cannot connect through that SSH alias because public SSH is already blocked.
Previously, wake rejected existing droplets, so this path wasn’t reachable.
Could we preserve the working Tailscale address when resuming and add a regression test for retrying after firewall lockdown?
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.
dropkit wake previously stopped waiting after five minutes, even when DigitalOcean was still restoring the droplet.
In the observed case, restoration took 6 minutes 35 seconds. Dropkit exited before configuring SSH, and retrying wake
refused because the droplet already existed, suggesting that it be destroyed or renamed.
This change allows retries to resume setup when the existing droplet’s source image matches the retained hibernation
snapshot. It also increases the default wait to 15 minutes, adds a configurable --timeout, and provides recovery
instructions when waiting times out. The snapshot is preserved if SSH configuration fails so setup can be retried.