[sled-agent-config-reconciler] Check zone dataset dependencies before starting zones #8219
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
andrewjstone
approved these changes
May 28, 2025
Contributor
andrewjstone
left a comment
andrewjstone
left a comment
There was a problem hiding this comment.
Looks straightforward. Thanks for the thorough fix!
sled-agent/src/services.rs
Outdated
| ) | ||
| .await?; | ||
|
|
||
| // TODO-john fixme |
Contributor
Author
There was a problem hiding this comment.
This was a reminder to myself to do #8220 😅. It's removed there.
| } | ||
|
|
||
| #[tokio::test] | ||
| async fn start_zone_fails_if_missing_root_dataset() { |
| // | ||
| // Skipping that for now, follow the normal zone shutdown process | ||
| // _after_ metrics (i.e., shut down and clean up the zone). | ||
| // |
Contributor
There was a problem hiding this comment.
Is there a way to detect if this happens?
Contributor
Author
There was a problem hiding this comment.
I'm not sure; most of this comment was lifted verbatim from services.rs (where we similarly didn't do anything for metrics for preexisting zones).
smklein
approved these changes
Jun 4, 2025
With all the zone start and ledgering moved to `sled-agent-config-reconciler`, we can remove this type entirely from `sled-agent`. I kept the schema check but moved it to the `legacy_configs.rs` module in the config reconciler, where the same structs still exist to allow conversion of the old ledgers -> the new combined ledger. Builds on top of #8219.
jgallagher
merged commit 6ea36d1
into
john/sled-agent-config-reconciler-datasets-refactor
9 checks passed
jgallagher
added a commit
that referenced
this pull request
Jun 9, 2025
… starting zones (#8219) This dramatically reduces the work that `ServiceManager::start_omicron_zone()` does by moving most of it to the config-reconciler: * Moved: shutting down existing zone of the same name * Moved: checking for time sync * Reworked: checking datasets and choosing a root zpool (now checks are performed against the most-recently-reconciled `DatasetConfig`s, and we never choose a root zpool since all zones have a property specifying which they should use) Builds on #8064 + #8218. Fixes #8173.
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.
This dramatically reduces the work that
ServiceManager::start_omicron_zone()does by moving most of it to the config-reconciler:DatasetConfigs, and we never choose a root zpool since all zones have a property specifying which they should use)Builds on #8064 + #8218.
Fixes #8173.