Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clarify sled-agent method related to datasets #7096

Merged
merged 1 commit into from
Nov 19, 2024
Merged

Clarify sled-agent method related to datasets #7096

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions sled-agent/src/services.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3482,7 +3482,11 @@ impl ServiceManager {
//
// If the requested zones contain any datasets not configured on this sled,
// an error is returned.
async fn check_requested_zone_datasets_exist(
//
// In this check the configured datasets are those intended to exist as
// written in a ledger. The datasets themselves may not actually physically
// exist yet, or they may have failed.
async fn check_requested_zone_datasets_configured(
&self,
request: &OmicronZonesConfig,
) -> Result<(), Error> {
Expand Down Expand Up @@ -3544,7 +3548,7 @@ impl ServiceManager {
new_request: OmicronZonesConfig,
fake_install_dir: Option<&String>,
) -> Result<(), Error> {
self.check_requested_zone_datasets_exist(&new_request).await?;
self.check_requested_zone_datasets_configured(&new_request).await?;

// Do some data-normalization to ensure we can compare the "requested
// set" vs the "existing set" as HashSets.
Expand Down
Loading