wgengine: support recovery from watchdog timeouts - #129
Draft
usman-heracles wants to merge 1 commit into
Draft
Conversation
usman-heracles
force-pushed
the
usman/recover-watchdog-timeout
branch
from
August 2, 2026 15:57
bb37bf3 to
27c2322
Compare
usman-heracles
force-pushed
the
usman/recover-watchdog-timeout
branch
from
August 2, 2026 16:09
27c2322 to
8eaea8f
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.
Problem
A wedged
wgengine.Engineoperation currently reaches the watchdog's fatal path after 45 seconds. For Coder workspace agents, this terminates the whole process even though the failed tailnet generation can be abandoned and replaced.Change
NewWatchdogWithTimeoutCallback, which poisons one engine generation and returnsErrWatchdogTimeoutinstead of terminating the processClose/Waitsafe when the wrapped engine is stuckThe existing
NewWatchdogbehavior is unchanged.Validation
go test ./wgengine -count=1go test -race ./wgengine -run 'TestWatchdog' -count=1go test -race -v ./wgengine -run 'TestWatchdog(DefaultTimeoutExitsProcess|DisabledLeavesHungOperationRunning|TimeoutCallback)$' -count=1demonstrates an actual subprocess exit on the current fatal path, the environment-variable mitigation, and recoverable poison/callback behavior with controlled blocked operationsIntegration
A companion Coder change recreates only the agent tailnet generation after the callback, preserving the workspace-agent process, SSH server, reconnecting PTYs, scripts, and metadata loops.