[reconfigurator] BlueprintBuilder cleanup 2/5 - move BlueprintDatasetsEditor to its own module
#7104
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
smklein
approved these changes
Nov 19, 2024
| if added == 0 && updated == 0 && expunged == 0 && removed == 0 { | ||
| Ok(EnsureMultiple::NotNeeded) | ||
| } else { | ||
| Ok(EnsureMultiple::Changed { added, updated, expunged, removed: 0 }) |
There was a problem hiding this comment.
Suggested change
| Ok(EnsureMultiple::Changed { added, updated, expunged, removed: 0 }) | |
| Ok(EnsureMultiple::Changed { added, updated, expunged, removed }) |
I do think this is functionally the same, but if we have a removed variable, we should use it
nexus/reconfigurator/planning/src/blueprint_builder/builder/datasets_editor.rs
Show resolved
Hide resolved
nexus/reconfigurator/planning/src/blueprint_builder/builder/datasets_editor.rs
Outdated
Show resolved
Hide resolved
nexus/reconfigurator/planning/src/blueprint_builder/builder/datasets_editor.rs
Outdated
Show resolved
Hide resolved
andrewjstone
approved these changes
Nov 19, 2024
| use std::net::SocketAddrV6; | ||
|
|
||
| #[derive(Debug, thiserror::Error)] | ||
| pub enum BlueprintDatasetsEditError { |
There was a problem hiding this comment.
👍 to the detailed error.
nexus/reconfigurator/planning/src/blueprint_builder/builder/datasets_editor.rs
Show resolved
Hide resolved
jgallagher
force-pushed
the
john/reconfigurator-storage-2
branch
from
ab94020 to
552d8bc
Compare
jgallagher
added a commit
that referenced
this pull request
Nov 21, 2024
…tStorageEditor` (#7105) Builds and is staged on top of #7104. This introduces a `BlueprintStorageEditor` that handles disks and datasets together, and attempts to address the API issues described by #7080: * Adding a zone also adds its datasets * Adding a disk also adds its Debug and Zone Root datasets * Expunging a disk expunges any datasets that were on it * Expunging a dataset expunges any zones that were on it This should allow `BlueprintBuilder` clients who don't or can't call `sled_ensure_{disks,datasets}` (like reconfigurator-cli and some tests) to construct valid blueprints.
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.
Followup to (and staged on top of) #7103, and makes similar changes for datasets as that PR did for disks.
Much more expectorate churn in this one, but it should all still be stable.