Recover containers from stuck FUSE mounts - #1824
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
All reported issues were addressed across 3 files
Reply with feedback, questions, or to request a fix.
Re-trigger cubic
luke-lombardi
force-pushed
the
ll/cleanup-fuse
branch
from
August 2, 2026 19:36
b385523 to
a5b8827
Compare
mernit
approved these changes
Aug 2, 2026
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.
Summary by cubic
Recover containers that hang on shutdown due to stuck FUSE mounts. Adds thread-safe lifecycle state and guarded stop escalation to safely abort stuck mounts and prevent indefinite shutdowns.
pkg/storage/geese.go: On geesefs flush timeout, locate the FUSE connection via/proc/self/mountinfoand abort it by writing to/sys/fs/fuse/connections/<id>/abort(mountsfusectlif needed).pkg/worker/worker.go: Guard single stop escalation withStopEscalationStarted; defaultStopReasonto unknown when missing. After SIGKILL, wait 2m; if still running on Geese storage, unmount the workspace to recover a stuck FUSE mount, but only whenworkspaceOnlyStoppingconfirms all siblings in the workspace are stopping. Add thread-safe lifecycle state (stateMu,lifecycleState,setExitCode,setStopReason) to avoid races.pkg/worker/{lifecycle.go,criu.go,sandbox.go}: Read/write stop reasons and exit codes vialifecycleStateand setters to prevent data races.pkg/worker/worker_test.go: Added a concurrency test to verifyworkspaceOnlyStoppingprotects running siblings.Written for commit a5b8827. Summary will update on new commits.