DiskTest: send full sled config to sim-sled-agent instead of just datasets (PR 2/4)#10881
Merged
Conversation
This is several yaks deep from a problem I was poking at: this PR addresses a few TODOs inside sim-sled-agent where it was still using / exposing the legacy triple of separate disks / datasets / zones configs. As of this PR it uses `OmicronSledConfig` internally, although for now it still exposes separate disk/dataset configs (to avoid too much churn in one change).
smklein
approved these changes
Jul 21, 2026
jmpesp
approved these changes
Jul 22, 2026
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
3 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.
Now that sim-sled-agent keeps a full
OmicronSledConfig, updateDiskTestto use that instead of going through the shimdatasets_ensure().There is a behavior change here, but it didn't cause any failing tests:
DiskTestnow appends disks and datasets to the config instead of replacing the datasets (and leaving the disks untouched). Since the nexus-test stack at least kinda sorta tries to be faithful in adding zone datasets for the services it starts, appending seems slightly more correct?