Repository navigation
Load machine defaults from the daemon's configuration roots - #2547
Open
vincent-peng wants to merge 1 commit into
Open
vincent-peng wants to merge 1 commit into
vincent-peng wants to merge 1 commit into
Conversation
vincent-peng
marked this pull request as ready for review
November 21, 2026 00:32
This branch has not been deployed
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
When the CLI and running daemon resolve different configuration roots,
machine createcan use the CLI's CPU, memory and home-mount defaults. Load configuration throughClientHealthCheck.loadContainerSystemConfig()so creation uses the daemon's app and installation roots. Explicit command-line flags retain precedence.This addresses the MachineCreate follow-up identified in #2451. Add a CLI integration test with conflicting client roots that checks daemon defaults and explicit flag overrides without changing shared daemon configuration.
Testing
Built all test products with
swift build --build-tests --jobs 6 -Xswiftc -warnings-as-errors -Xswiftc -enable-testing.With isolated services, the new regression fails all three default-value assertions on unchanged main and passes with this change. The focused CLI run passes all 5 tests:
The 41 tests selected by
MachineConfigTests|ConfigurationLoaderTests|HelpCommandTestsalso pass. Swift formatting checks pass. Tested on Apple Silicon, macOS 27.2.1, Swift 6.4.2. The selected machine tests use--no-boot; the full VM integration suite was not run locally.