[11/n] [sled-agent] move around ZoneImageFileSource logic #8235
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 [skip ci]
Created using spr 1.3.6-beta.1
5 tasks
Created using spr 1.3.6-beta.1 [skip ci]
Created using spr 1.3.6-beta.1 [skip ci]
andrewjstone
approved these changes
Jun 10, 2025
Created using spr 1.3.6-beta.1 [skip ci]
jgallagher
reviewed
Jun 16, 2025
| @@ -2003,7 +2004,7 @@ impl InstanceRunner { | |||
| .with_log(self.log.clone()) | |||
| .with_underlay_vnic_allocator(&self.vnic_allocator) | |||
| .with_zone_root_path(root) | |||
| .with_zone_image_paths(&["/opt/oxide".into()]) | |||
| .with_file_source(&ramdisk_file_source("propolis-server")) | |||
There was a problem hiding this comment.
Could ramdisk_file_source take a ZoneType or ZoneKind instead of a bare str?
There was a problem hiding this comment.
Ah no because propolis-server isn't an Omicron zone (what ZoneType and ZoneKind represent). Will add a comment here.
There was a problem hiding this comment.
Ah right. That's unfortunate.
sunshowers
changed the base branch from
sunshowers/spr/main.11n-sled-agent-move-around-zoneimagefilesource-logic
to
main
sunshowers
deleted the
sunshowers/spr/11n-sled-agent-move-around-zoneimagefilesource-logic
branch
sunshowers
added a commit
that referenced
this pull request
Jun 19, 2025
…t error (#8237) For mupdate overrides, in order to be safe, we must know that the data stored in the JSON is consistent with the images stored on disk. We currently apply this logic to install dataset hashes, and will apply it to artifact hashes in the future. Questions: * [x] ~~Should we apply this logic to more critical zones like the switch zone? They're always going to be part of the ramdisk maybe?~~ We unconditionally succeed for RAMdisk zones, and in particular the switch zone, now. * [ ] How does this interact with config-reconciler work? On error, that would permanently be blocked it seems to me. Note: we decide errors per-zone now. * [ ] We ask for the boot zpool to be passed in but also cache it as part of constructing the info... how do we reconcile the relative presence or absence of this info? Depends on #8235.
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.
ZoneImageFileSourceto illumos-utils and use it in the zone image builder.Depends on: