fixes for pluto #4032
Merged
fixes for pluto #4032
Conversation
This file contains 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
cbgbt
approved these changes
Jun 4, 2024
cbgbt
reviewed
Jun 4, 2024
packages/os/pluto.service
Outdated
Comment on lines
20
to
30
| [Install] | ||
| RequiredBy=preconfigured.target | ||
| RequiredBy=settings-applier.service |
There was a problem hiding this comment.
I'd prefer to comment here that pluto requires the settings-applier service to commit its changes added to an open transaction.
This may be a clear responsibility implied by its position in the service tree that I've forgotten, though. If it's an obvious detail we can omit.
There was a problem hiding this comment.
I'd prefer to comment here that pluto requires the settings-applier service to commit its changes added to an open transaction.
Added some comments. Let me know if it's still not clear; this is an under-documented area of the system.
arnaldo2792
approved these changes
Jun 4, 2024
| @@ -11,6 +11,7 @@ exclude = ["README.md"] | |||
|
|
|||
| [dependencies] | |||
| bytes = "1" | |||
| constants = { path = "../../constants", version = "0.1" } | |||
There was a problem hiding this comment.
Where is my dollar? 🤑
settings-applier.service is expected to be the last unit in the chain before initial system configuration is done. Ensure that pluto runs and completes successfully before it starts. Signed-off-by: Ben Cressey <bcressey@amazon.com>
When settings-applier.service starts, it runs settings-committer, because it expects that sundog will have added generated settings to the launch transaction, and then runs thar-be-settings to apply the changes. However, if pluto runs, it will have already committed any settings from sundog, and then directly applied the settings via apiclient. This introduces a different mode for system boot depending on whether pluto is installed, and also worsens boot time as thar-be-settings is relatively slow. Fix this by having pluto add its own generated settings to the launch transaction, so that settings-committer always has pending changes to commit, and so that thar-be-settings only runs once. Signed-off-by: Ben Cressey <bcressey@amazon.com>
webern
approved these changes
Jun 5, 2024
cbgbt
approved these changes
Jun 6, 2024
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.
Issue number:
Fixes #3828
Description of changes:
Conceptually, these changes make
plutoact a bit more like a settings generator: it now runs in betweensundogandthar-be-settings, and it letsthar-be-settingshandle the actual commit.Testing done:
Annotated output after these changes:
Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.