[sled-agent-config-reconciler] Flesh out ExternalDisks type
#8111
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
Base automatically changed from
john/sled-agent-config-reconciler-internal-disks
to
main
May 8, 2025 19:07
jgallagher
force-pushed
the
john/sled-agent-config-reconciler-external-disks
branch
from
733eddb to
4a56c9c
Compare
smklein
approved these changes
May 9, 2025
sled-agent/config-reconciler/src/reconciler_task/external_disks.rs
Outdated
Show resolved
Hide resolved
Comment on lines
307
to
319
| // Take ownership of our current disk state (if we have one), then | ||
| // immediately put back the new state. | ||
| let maybe_current = self.disks.remove(&config.id); | ||
| self.disks.insert( | ||
| self.try_ensure_disk_managed( | ||
| maybe_current, | ||
| config, | ||
| raw_disk, | ||
| disk_adopter, | ||
| log, | ||
| ) | ||
| .await, | ||
| ); |
There was a problem hiding this comment.
Given that "disk adoption" might involve creating partitions on the underlying disks, it seems like it might be nice to do this operation concurrently?
This appears to currently be:
- Take out the Option for the disk
- Call "try_ensure_disk_managed" to transform that state (or create it, if it was None)
- Put that state back into
self.disks
Each operation seems to be acting on independent parts of self.disks, and I don't think the disk_adopter actually needs mutability. WDYT about doing this concurrently?
There was a problem hiding this comment.
(I care less about this in the removal path, because that's significantly cheaper)
There was a problem hiding this comment.
Sure, straightforward enough! Good call, done in d4e915d
sled-agent/config-reconciler/src/reconciler_task/external_disks.rs
Outdated
Show resolved
Hide resolved
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.
Staged on top of #8103, and is pretty similar to it. The biggest difference is that #8103 adds a tokio task responsible for adopting internal disks automatically, and this adds an
ExternalDiskstype that will be used by the reconciler task to adopt external disks only when asked to viaOmicronSledConfig.