LinuxContainer: Keep reference to vended execs #408
Merged
+166
−13
Conversation
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
dcantah
force-pushed
the
process-track
branch
from
64f043a to
de859e9
Compare
This change is aimed at making forgetting to call .delete() on a LinuxProcess less destructive than it can be. Because Virt.framework invalidates any vsock fds it vended if the vm is stopped, trying to perform some operations on the grpc client through any of the process methods could trigger an ebadf, which NIO asserts on. This keeps a reference to the execs and deletes all of them for you once the container dies. I still think leaving .delete a public method is useful as otherwise the stdio fds are left open, but cleanup should occur all in one place now if you don't care about this. This additionally: 1. Fixes two of our tests that forgot to delete() an exec. 2. Adds two new tests to verify that process.delete() is now idempotent, and we don't need to call delete().
dcantah
force-pushed
the
process-track
branch
from
de859e9 to
6d72c5b
Compare
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
dkovba
approved these changes
Nov 13, 2025
richardkiene
added a commit
to Vas-Solutus/arca-containerization
that referenced
this pull request
Dec 1, 2025
Sync with Apple's containerization repo (57 commits behind). Notable upstream changes: - LinuxContainer: "Harden" stop (apple#388) - OCI runtime support (apple#416) - Memory threshold monitoring (apple#427) - FileHandle option for serial console (apple#410) - Keep reference to vended execs (apple#408) - Sync(2) on shutdown (apple#400) - Fix ImageStore.prune() behavior (apple#420) - Various stability improvements Resolved conflicts: - LinuxContainer.swift: Merged bootLog type change with our useNetworkNamespace - Application.swift: Kept our service startup code (removed old log line per upstream) - Server+GRPC.swift: Used upstream's async ManagedContainer, kept our DNS comment
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This change is aimed at making forgetting to call .delete() on a LinuxProcess less destructive than it can be. Because Virt.framework invalidates any vsock fds it vended if the vm is stopped, trying to perform some operations on the grpc client through any of the process methods could trigger an ebadf, which NIO asserts on. This keeps a reference to the execs and deletes all of them for you once the container dies. I still think leaving .delete a public method is useful as otherwise the stdio fds are left open, but cleanup should occur all in one place now if you don't care about this.
This additionally: