oxidecomputer · smklein · Oct 30, 2024 · Jul 18, 2024 · Jul 22, 2024 · Jul 22, 2024
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/clients/sled-agent-client/src/lib.rs b/clients/sled-agent-client/src/lib.rs
@@ -43,6 +43,7 @@ progenitor::generate_api!(
     replace = {
         Baseboard = nexus_sled_agent_shared::inventory::Baseboard,
         ByteCount = omicron_common::api::external::ByteCount,
+        DatasetsConfig = omicron_common::disk::DatasetsConfig,
         DatasetKind = omicron_common::api::internal::shared::DatasetKind,
         DiskIdentity = omicron_common::disk::DiskIdentity,
         DiskVariant = omicron_common::disk::DiskVariant,

diff --git a/common/src/api/internal/shared.rs b/common/src/api/internal/shared.rs
@@ -860,8 +860,8 @@ pub enum DatasetKind {
     InternalDns,
 
     // Zone filesystems
-    ZoneRoot,
-    Zone {
+    TransientZoneRoot,
+    TransientZone {
         name: String,
     },
 
@@ -929,15 +929,15 @@ impl DatasetKind {
         match self {
             Cockroach | Crucible | Clickhouse | ClickhouseKeeper
             | ClickhouseServer | ExternalDns | InternalDns => true,
-            ZoneRoot | Zone { .. } | Debug | Update => false,
+            TransientZoneRoot | TransientZone { .. } | Debug | Update => false,
         }
     }
 
     /// Returns the zone name, if this is a dataset for a zone filesystem.
     ///
     /// Otherwise, returns "None".
     pub fn zone_name(&self) -> Option<&str> {
-        if let DatasetKind::Zone { name } = self {
+        if let DatasetKind::TransientZone { name } = self {
             Some(name)
         } else {
             None
@@ -961,8 +961,8 @@ impl fmt::Display for DatasetKind {
             ClickhouseServer => "clickhouse_server",
             ExternalDns => "external_dns",
             InternalDns => "internal_dns",
-            ZoneRoot => "zone",
-            Zone { name } => {
+            TransientZoneRoot => "zone",
+            TransientZone { name } => {
                 write!(f, "zone/{}", name)?;
                 return Ok(());
             }
@@ -992,12 +992,12 @@ impl FromStr for DatasetKind {
             "clickhouse_server" => ClickhouseServer,
             "external_dns" => ExternalDns,
             "internal_dns" => InternalDns,
-            "zone" => ZoneRoot,
+            "zone" => TransientZoneRoot,
             "debug" => Debug,
             "update" => Update,
             other => {
                 if let Some(name) = other.strip_prefix("zone/") {
-                    Zone { name: name.to_string() }
+                    TransientZone { name: name.to_string() }
                 } else {
                     return Err(DatasetKindParseError::UnknownDataset(
                         s.to_string(),
@@ -1087,8 +1087,8 @@ mod tests {
             DatasetKind::ClickhouseServer,
             DatasetKind::ExternalDns,
             DatasetKind::InternalDns,
-            DatasetKind::ZoneRoot,
-            DatasetKind::Zone { name: String::from("myzone") },
+            DatasetKind::TransientZoneRoot,
+            DatasetKind::TransientZone { name: String::from("myzone") },
             DatasetKind::Debug,
             DatasetKind::Update,
         ];

diff --git a/common/src/disk.rs b/common/src/disk.rs
@@ -12,6 +12,7 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::collections::BTreeMap;
 use std::fmt;
+use std::str::FromStr;
 use uuid::Uuid;
 
 use crate::{
@@ -186,6 +187,18 @@ impl GzipLevel {
     }
 }
 
+impl FromStr for GzipLevel {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let level = s.parse::<u8>()?;
+        if level < GZIP_LEVEL_MIN || level > GZIP_LEVEL_MAX {
+            bail!("Invalid gzip compression level: {level}");
+        }
+        Ok(Self(level))
+    }
+}
+
 #[derive(
     Copy,
     Clone,
@@ -224,6 +237,7 @@ pub enum CompressionAlgorithm {
     Zle,
 }
 
+/// These match the arguments which can be passed to "zfs set compression=..."
 impl fmt::Display for CompressionAlgorithm {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         use CompressionAlgorithm::*;
@@ -242,6 +256,29 @@ impl fmt::Display for CompressionAlgorithm {
     }
 }
 
+impl FromStr for CompressionAlgorithm {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        use CompressionAlgorithm::*;
+        let c = match s {
+            "on" => On,
+            "" | "off" => Off,
+            "gzip" => Gzip,
+            "lz4" => Lz4,
+            "lzjb" => Lzjb,
+            "zle" => Zle,
+            _ => {
+                let Some(suffix) = s.strip_prefix("gzip-") else {
+                    bail!("Unknown compression algorithm {s}");
+                };
+                GzipN { level: suffix.parse()? }
+            }
+        };
+        Ok(c)
+    }
+}
+
 /// Configuration information necessary to request a single dataset
 #[derive(
     Clone,

diff --git a/dev-tools/reconfigurator-cli/src/main.rs b/dev-tools/reconfigurator-cli/src/main.rs
@@ -686,9 +686,12 @@ fn cmd_sled_show(
     swriteln!(s, "sled {}", sled_id);
     swriteln!(s, "subnet {}", sled_resources.subnet.net());
     swriteln!(s, "zpools ({}):", sled_resources.zpools.len());
-    for (zpool, disk) in &sled_resources.zpools {
+    for (zpool, (disk, datasets)) in &sled_resources.zpools {
         swriteln!(s, "    {:?}", zpool);
-        swriteln!(s, "    ↳ {:?}", disk);
+        swriteln!(s, "    {:?}", disk);
+        for dataset in datasets {
+            swriteln!(s, "    ↳ {:?}", dataset);
+        }
     }
     Ok(Some(s))
 }
@@ -840,7 +843,12 @@ fn cmd_blueprint_edit(
                 .context("failed to add Nexus zone")?;
             assert_matches::assert_matches!(
                 added,
-                EnsureMultiple::Changed { added: 1, removed: 0 }
+                EnsureMultiple::Changed {
+                    added: 1,
+                    updated: 0,
+                    expunged: 0,
+                    removed: 0
+                }
             );
             format!("added Nexus zone to sled {}", sled_id)
         }
@@ -852,7 +860,12 @@ fn cmd_blueprint_edit(
                 .context("failed to add CockroachDB zone")?;
             assert_matches::assert_matches!(
                 added,
-                EnsureMultiple::Changed { added: 1, removed: 0 }
+                EnsureMultiple::Changed {
+                    added: 1,
+                    updated: 0,
+                    expunged: 0,
+                    removed: 0
+                }
             );
             format!("added CockroachDB zone to sled {}", sled_id)
         }

diff --git a/dev-tools/reconfigurator-cli/tests/output/cmd-example-stdout b/dev-tools/reconfigurator-cli/tests/output/cmd-example-stdout
@@ -40,25 +40,25 @@ sled 2eb69596-f081-4e2d-9425-9994926e0832
 subnet fd00:1122:3344:102::/64
 zpools (10):
     088ed702-551e-453b-80d7-57700372a844 (zpool)
-    ↳ SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-088ed702-551e-453b-80d7-57700372a844" }, disk_id: b2850ccb-4ac7-4034-aeab-b1cd582d407b (physical_disk), policy: InService, state: Active }
+    SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-088ed702-551e-453b-80d7-57700372a844" }, disk_id: b2850ccb-4ac7-4034-aeab-b1cd582d407b (physical_disk), policy: InService, state: Active }
     09e51697-abad-47c0-a193-eaf74bc5d3cd (zpool)
-    ↳ SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-09e51697-abad-47c0-a193-eaf74bc5d3cd" }, disk_id: c6d1fe0d-5226-4318-a55a-e86e20612277 (physical_disk), policy: InService, state: Active }
+    SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-09e51697-abad-47c0-a193-eaf74bc5d3cd" }, disk_id: c6d1fe0d-5226-4318-a55a-e86e20612277 (physical_disk), policy: InService, state: Active }
     3a512d49-edbe-47f3-8d0b-6051bfdc4044 (zpool)
-    ↳ SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-3a512d49-edbe-47f3-8d0b-6051bfdc4044" }, disk_id: 24510d37-20b1-4bdc-9ca7-c37fff39abb2 (physical_disk), policy: InService, state: Active }
+    SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-3a512d49-edbe-47f3-8d0b-6051bfdc4044" }, disk_id: 24510d37-20b1-4bdc-9ca7-c37fff39abb2 (physical_disk), policy: InService, state: Active }
     40517680-aa77-413c-bcf4-b9041dcf6612 (zpool)
-    ↳ SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-40517680-aa77-413c-bcf4-b9041dcf6612" }, disk_id: 30ed317f-1717-4df6-8c1c-69f9d438705e (physical_disk), policy: InService, state: Active }
+    SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-40517680-aa77-413c-bcf4-b9041dcf6612" }, disk_id: 30ed317f-1717-4df6-8c1c-69f9d438705e (physical_disk), policy: InService, state: Active }
     78d3cb96-9295-4644-bf78-2e32191c71f9 (zpool)
-    ↳ SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-78d3cb96-9295-4644-bf78-2e32191c71f9" }, disk_id: 5ac39660-8149-48a2-a6df-aebb0f30352a (physical_disk), policy: InService, state: Active }
+    SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-78d3cb96-9295-4644-bf78-2e32191c71f9" }, disk_id: 5ac39660-8149-48a2-a6df-aebb0f30352a (physical_disk), policy: InService, state: Active }
     853595e7-77da-404e-bc35-aba77478d55c (zpool)
-    ↳ SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-853595e7-77da-404e-bc35-aba77478d55c" }, disk_id: 43083372-c7d0-4df3-ac4e-96c45cde28d9 (physical_disk), policy: InService, state: Active }
+    SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-853595e7-77da-404e-bc35-aba77478d55c" }, disk_id: 43083372-c7d0-4df3-ac4e-96c45cde28d9 (physical_disk), policy: InService, state: Active }
     8926e0e7-65d9-4e2e-ac6d-f1298af81ef1 (zpool)
-    ↳ SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-8926e0e7-65d9-4e2e-ac6d-f1298af81ef1" }, disk_id: 13e65865-2a6e-41f7-aa18-6ef8dff59b4e (physical_disk), policy: InService, state: Active }
+    SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-8926e0e7-65d9-4e2e-ac6d-f1298af81ef1" }, disk_id: 13e65865-2a6e-41f7-aa18-6ef8dff59b4e (physical_disk), policy: InService, state: Active }
     9c0b9151-17f3-4857-94cc-b5bfcd402326 (zpool)
-    ↳ SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-9c0b9151-17f3-4857-94cc-b5bfcd402326" }, disk_id: 40383e60-18f6-4423-94e7-7b91ce939b43 (physical_disk), policy: InService, state: Active }
+    SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-9c0b9151-17f3-4857-94cc-b5bfcd402326" }, disk_id: 40383e60-18f6-4423-94e7-7b91ce939b43 (physical_disk), policy: InService, state: Active }
     d61354fa-48d2-47c6-90bf-546e3ed1708b (zpool)
-    ↳ SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-d61354fa-48d2-47c6-90bf-546e3ed1708b" }, disk_id: e02ae523-7b66-4188-93c8-c5808c01c795 (physical_disk), policy: InService, state: Active }
+    SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-d61354fa-48d2-47c6-90bf-546e3ed1708b" }, disk_id: e02ae523-7b66-4188-93c8-c5808c01c795 (physical_disk), policy: InService, state: Active }
     d792c8cb-7490-40cb-bb1c-d4917242edf4 (zpool)
-    ↳ SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-d792c8cb-7490-40cb-bb1c-d4917242edf4" }, disk_id: c19e5610-a3a2-4cc6-af4d-517a49ef610b (physical_disk), policy: InService, state: Active }
+    SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-d792c8cb-7490-40cb-bb1c-d4917242edf4" }, disk_id: c19e5610-a3a2-4cc6-af4d-517a49ef610b (physical_disk), policy: InService, state: Active }
 
 
 > blueprint-show ade5749d-bdf3-4fab-a8ae-00bea01b3a5a
@@ -494,13 +494,13 @@ sled 89d02b1b-478c-401a-8e28-7a26f74fa41b
 subnet fd00:1122:3344:101::/64
 zpools (4):
     44fa7024-c2bc-4d2c-b478-c4997e4aece8 (zpool)
-    ↳ SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-44fa7024-c2bc-4d2c-b478-c4997e4aece8" }, disk_id: 2a15b33c-dd0e-45b7-aba9-d05f40f030ff (physical_disk), policy: InService, state: Active }
+    SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-44fa7024-c2bc-4d2c-b478-c4997e4aece8" }, disk_id: 2a15b33c-dd0e-45b7-aba9-d05f40f030ff (physical_disk), policy: InService, state: Active }
     8562317c-4736-4cfc-9292-7dcab96a6fee (zpool)
-    ↳ SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-8562317c-4736-4cfc-9292-7dcab96a6fee" }, disk_id: cad6faa6-9409-4496-9aeb-392b3c50bed4 (physical_disk), policy: InService, state: Active }
+    SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-8562317c-4736-4cfc-9292-7dcab96a6fee" }, disk_id: cad6faa6-9409-4496-9aeb-392b3c50bed4 (physical_disk), policy: InService, state: Active }
     ce1c13f3-bef2-4306-b0f2-4e39bd4a18b6 (zpool)
-    ↳ SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-ce1c13f3-bef2-4306-b0f2-4e39bd4a18b6" }, disk_id: 7d89a66e-0dcd-47ab-824d-62186812b8bd (physical_disk), policy: InService, state: Active }
+    SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-ce1c13f3-bef2-4306-b0f2-4e39bd4a18b6" }, disk_id: 7d89a66e-0dcd-47ab-824d-62186812b8bd (physical_disk), policy: InService, state: Active }
     f931ec80-a3e3-4adb-a8ba-fa5adbd2294c (zpool)
-    ↳ SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-f931ec80-a3e3-4adb-a8ba-fa5adbd2294c" }, disk_id: 41755be9-2c77-4deb-87a4-cb53f09263fa (physical_disk), policy: InService, state: Active }
+    SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-f931ec80-a3e3-4adb-a8ba-fa5adbd2294c" }, disk_id: 41755be9-2c77-4deb-87a4-cb53f09263fa (physical_disk), policy: InService, state: Active }
 
 
 > blueprint-show ade5749d-bdf3-4fab-a8ae-00bea01b3a5a