[2/n] [reconfigurator-planning] avoid wiping out boot partition state#8937
Merged
sunshowers merged 4 commits intoAug 29, 2025
Conversation
Created using spr 1.3.6-beta.1
jgallagher
approved these changes
Aug 28, 2025
| RemoveMupdateOverrideBootSuccessInventory::Removed, | ||
| ), | ||
| non_boot_message: "mupdate override successfully removed \ | ||
| on non-boot disks" |
Contributor
There was a problem hiding this comment.
Formatting got a little off here
| /// look at the actual `last_reconciliation` value from the parent | ||
| /// [`Inventory`]. | ||
| pub fn debug_update_assume_success(&mut self, config: OmicronSledConfig) { | ||
| let external_disks = config |
Contributor
There was a problem hiding this comment.
Is most of this basically identical to debug_assume_success()? I wonder if debug_assume_success() could call this function internally to avoid the duplication; untested but something like
let mut inv = Self {
// these fields will be filled in by `debug_update_assume_success()`
last_reconciled_config: OmicronSledConfig::default(),
external_disks: BTreeMap::default(),
datasets: BTreeMap::default(),
orphaned_datasets: IdOrdMap::default(),
zones: BTreeMap::default(),
remove_mupdate_override: None,
// these fields will not
boot_partitions: BootPartitionContents::debug_assume_success(),
};
inv.debug_update_assume_success(config);
invCreated using spr 1.3.6-beta.1
Created using spr 1.3.6-beta.1
Created using spr 1.3.6-beta.1
jgallagher
added a commit
that referenced
this pull request
Aug 29, 2025
iliana
pushed a commit
that referenced
this pull request
Sep 2, 2025
…#8937) The boot partition state is going to become important in tests soon, since we want to set up the simulated system such that no MGS-driven updates are happening. Simply calling `debug_assume_success` wipes out MGS-related state, so add an alternative that doesn't.
iliana
pushed a commit
that referenced
this pull request
Sep 2, 2025
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
2 participants
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.
The boot partition state is going to become important in tests soon, since we want to set up the simulated system such that no MGS-driven updates are happening. Simply calling
debug_assume_successwipes out MGS-related state, so add an alternative that doesn't.