[sled-agent][sim] Use a shared support bundle implementation #7264
Conversation
This file contains 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
changed the title
wfchandler
reviewed
Dec 20, 2024
There was a problem hiding this comment.
Thanks @smklein, this wrapper trait seems reasonable to me. Two related questions around how we're walking the path of nested datasets.
Comment on lines
+1218
to
+1227
| // Final component of path -- remove it if it exists. | ||
| if !path_component.contains('/') { | ||
| if nested_dataset.children.remove(path_component).is_none() { | ||
| return Err(HttpError::for_not_found( | ||
| None, | ||
| "Nested Dataset not found".to_string(), | ||
| )); | ||
| }; | ||
| return Ok(()); | ||
| } |
There was a problem hiding this comment.
As above, no component will contain /, so we'll always exit early and fail to iterate past the first component.
Comment on lines
+1165
to
+1183
| // Final component of path -- insert it here if it doesn't exist | ||
| // already. | ||
| if !path_component.contains('/') { | ||
| let entry = | ||
| nested_dataset.children.entry(path_component.to_string()); | ||
| entry | ||
| .and_modify(|storage| { | ||
| storage.config = config.clone(); | ||
| }) | ||
| .or_insert_with(|| { | ||
| NestedDatasetStorage::new( | ||
| &zpool_root, | ||
| config.name.root, | ||
| nested_path, | ||
| config.inner, | ||
| ) | ||
| }); | ||
| return Ok(()); | ||
| } |
There was a problem hiding this comment.
This condition will always evaluate to true since we're splitting path_component on /, so we'll never walk the full path.
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.
PR 3 / ???
This PR aims to re-use the support bundle management logic in sled-agent/src/support_bundle/storage.rs for both the real and simulated sled agent.
It accomplishes this goal with the following:
LocalStorage, that abstracts access to storage. The "real" sled agent accesses real storage, the simulated sled agent can access the simulated storage APIs..awaitcalls throughout Omicron.As an end result of this PR, tests in subsequent PRs (e.g. #7063) can rely on the simulated sled agent to respond realistically to support bundle requests, rather than using a stub implementation.