fix(plugins): bound discovery when apiserver stalls#1838
Closed
stephenlclarke wants to merge 1 commit into
Closed
Conversation
stephenlclarke
marked this pull request as ready for review
June 26, 2026 13:34
stephenlclarke
marked this pull request as draft
June 26, 2026 13:48
stephenlclarke
force-pushed
the
fix-plugin-discovery-timeouts
branch
from
June 26, 2026 13:52
1de4489 to
4b8186f
Compare
7 tasks
Author
stephenlclarke
added a commit
to stephenlclarke/container
that referenced
this pull request
Jul 15, 2026
Use a one-second API health deadline for container --help, container help, and bare container while preserving the normal ten-second plugin dispatch deadline. Fall back to built-in help when the daemon is unavailable. Depends on the cancellable XPC request handling from apple#1862 and supersedes apple#1838 for apple#1459.
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.
Type of Change
Motivation and Context
Plugin discovery can hang before root help or plugin dispatch completes when
com.apple.container.apiserveris registered but not answering XPC requests. This affects paths such ascontainer --help,container help, barecontainer, andcontainer compose ....Addresses #1459.
Related to #995, but this PR intentionally keeps a narrower scope:
XPCClient.send(... responseTimeout:)timeout primitive.Testing
Validation:
swift test --disable-automatic-resolution --enable-code-coverage --filter 'ApplicationHealthTests|XPCClientTests|HelpCommandTests'make swift-fmt-checkgit diff --checkThe focused coverage suite covers the new timeout/race behavior, root/default/help command paths, XPC timeout return, nil-route timeout messaging, normal XPC replies, and client reuse after timeout.