[10/n] [sled-agent] validate zone images as written in mupdate-override dataset #8190
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
Created using spr 1.3.6-beta.1
Created using spr 1.3.6-beta.1
sunshowers
changed the title
jgallagher
approved these changes
Jun 3, 2025
| @@ -61,7 +61,8 @@ struct ArtifactDestination { | |||
|
|
|||
| impl ArtifactDestination { | |||
| fn from_directory(dir: &Utf8Path) -> Result<Self> { | |||
| let control_plane_dir = dir.join("zones"); | |||
| // The install dataset goes into a directory called "install". | |||
| let control_plane_dir = dir.join("install"); | |||
There was a problem hiding this comment.
Was this just wrong before? (Hopefully only used by tests??)
| pub boot_disk_override: | ||
| Result<Option<MupdateOverrideInfo>, MupdateOverrideReadError>, | ||
|
|
||
| /// Status of the non-boot disks. This results in warnings. |
There was a problem hiding this comment.
Nit / question - this only results in warnings in bad cases, right? The typical case is MatchesPresent which would not emit warnings?
| )?; | ||
| } | ||
| ArtifactReadResult::Error(error) => { | ||
| writeln!(f, " {}: error ({})", artifact.file_name, error)?; |
There was a problem hiding this comment.
Should this print the whole error chain since ArtifactReadResult itself isn't an Error?
| let artifacts = | ||
| MupdateOverrideArtifactsResult::new(dataset_dir, data); | ||
| if artifacts.is_valid() { | ||
| // If there are errors, return them as appropriate. |
There was a problem hiding this comment.
Is this comment in the wrong branch? If artifacts.is_valid(), there are no errors right?
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.
Included in this PR:
test_installinator_fetchwicketd integration test to also ensure installinator + sled-agent have a coherent view of the worldThe last point forced me to expose a bunch of the status via a public interface. We'll be able to reuse this information (though probably not in this full form) and send it up as part of the inventory.
Depends on: