Merge branch 'explicit-datasets' into inventory-datasets

oxidecomputer · Jul 26, 2024 · 530bf08 · 530bf08
2 parents e2dd6d7 + 178e20e
commit 530bf08
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/sled-agent/src/rack_setup/plan/service.rs b/sled-agent/src/rack_setup/plan/service.rs
@@ -925,7 +925,7 @@ impl SledInfo {
         // enumerates the valid zpool indexes.
         let allocator = self
             .u2_zpool_allocators
-            .entry(kind.clone())
+            .entry(kind)
             .or_insert_with(|| Box::new(0..self.u2_zpools.len()));
         match allocator.next() {
             None => Err(PlanError::NotEnoughSleds),

diff --git a/sled-storage/src/manager.rs b/sled-storage/src/manager.rs
@@ -1086,14 +1086,14 @@ impl StorageManager {
 /// systems.
 #[cfg(all(test, target_os = "illumos"))]
 mod tests {
-    use crate::dataset::DatasetType;
     use crate::disk::RawSyntheticDisk;
     use crate::manager_test_harness::StorageManagerTestHarness;
     use crate::resources::DiskManagementError;
 
     use super::*;
     use camino_tempfile::tempdir_in;
     use omicron_common::api::external::Generation;
+    use omicron_common::disk::DatasetKind;
     use omicron_common::ledger;
     use omicron_test_utils::dev::test_setup_log;
     use sled_hardware::DiskFirmware;
@@ -1562,7 +1562,7 @@ mod tests {
         let dataset_id = Uuid::new_v4();
         let zpool_name = ZpoolName::new_external(config.disks[0].pool_id);
         let dataset_name =
-            DatasetName::new(zpool_name.clone(), DatasetType::Crucible);
+            DatasetName::new(zpool_name.clone(), DatasetKind::Crucible);
         harness
             .handle()
             .upsert_filesystem(dataset_id, dataset_name)