[sled-agent] Remove 'upsert_filesystem' API

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,

common/src/api/internal/shared.rs

@@ -853,8 +853,8 @@ pub enum DatasetKind {
     InternalDns,
 
     // Zone filesystems
-    ZoneRoot,
-    Zone {
+    TransientZoneRoot,
+    TransientZone {
         name: String,
     },
 
@@ -922,15 +922,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
@@ -954,8 +954,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(());
             }
@@ -985,12 +985,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(),
@@ -1080,8 +1080,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,
         ];

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,

dev-tools/reconfigurator-cli/src/main.rs

@@ -618,9 +618,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))
 }
@@ -781,7 +784,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)
         }
@@ -793,7 +801,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)
         }

dev-tools/reconfigurator-cli/tests/output/cmd-stdout

@@ -24,25 +24,25 @@ sled ..........<REDACTED_UUID>...........
 subnet fd00:1122:3344:101::/64
 zpools (10):
     ..........<REDACTED_UUID>........... (zpool)
-    ↳ SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-..........<REDACTED_UUID>..........." }, disk_id: ..........<REDACTED_UUID>........... (physical_disk), policy: InService, state: Active }
+    SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-..........<REDACTED_UUID>..........." }, disk_id: ..........<REDACTED_UUID>........... (physical_disk), policy: InService, state: Active }
     ..........<REDACTED_UUID>........... (zpool)
-    ↳ SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-..........<REDACTED_UUID>..........." }, disk_id: ..........<REDACTED_UUID>........... (physical_disk), policy: InService, state: Active }
+    SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-..........<REDACTED_UUID>..........." }, disk_id: ..........<REDACTED_UUID>........... (physical_disk), policy: InService, state: Active }
     ..........<REDACTED_UUID>........... (zpool)
-    ↳ SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-..........<REDACTED_UUID>..........." }, disk_id: ..........<REDACTED_UUID>........... (physical_disk), policy: InService, state: Active }
+    SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-..........<REDACTED_UUID>..........." }, disk_id: ..........<REDACTED_UUID>........... (physical_disk), policy: InService, state: Active }
     ..........<REDACTED_UUID>........... (zpool)
-    ↳ SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-..........<REDACTED_UUID>..........." }, disk_id: ..........<REDACTED_UUID>........... (physical_disk), policy: InService, state: Active }
+    SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-..........<REDACTED_UUID>..........." }, disk_id: ..........<REDACTED_UUID>........... (physical_disk), policy: InService, state: Active }
     ..........<REDACTED_UUID>........... (zpool)
-    ↳ SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-..........<REDACTED_UUID>..........." }, disk_id: ..........<REDACTED_UUID>........... (physical_disk), policy: InService, state: Active }
+    SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-..........<REDACTED_UUID>..........." }, disk_id: ..........<REDACTED_UUID>........... (physical_disk), policy: InService, state: Active }
     ..........<REDACTED_UUID>........... (zpool)
-    ↳ SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-..........<REDACTED_UUID>..........." }, disk_id: ..........<REDACTED_UUID>........... (physical_disk), policy: InService, state: Active }
+    SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-..........<REDACTED_UUID>..........." }, disk_id: ..........<REDACTED_UUID>........... (physical_disk), policy: InService, state: Active }
     ..........<REDACTED_UUID>........... (zpool)
-    ↳ SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-..........<REDACTED_UUID>..........." }, disk_id: ..........<REDACTED_UUID>........... (physical_disk), policy: InService, state: Active }
+    SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-..........<REDACTED_UUID>..........." }, disk_id: ..........<REDACTED_UUID>........... (physical_disk), policy: InService, state: Active }
     ..........<REDACTED_UUID>........... (zpool)
-    ↳ SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-..........<REDACTED_UUID>..........." }, disk_id: ..........<REDACTED_UUID>........... (physical_disk), policy: InService, state: Active }
+    SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-..........<REDACTED_UUID>..........." }, disk_id: ..........<REDACTED_UUID>........... (physical_disk), policy: InService, state: Active }
     ..........<REDACTED_UUID>........... (zpool)
-    ↳ SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-..........<REDACTED_UUID>..........." }, disk_id: ..........<REDACTED_UUID>........... (physical_disk), policy: InService, state: Active }
+    SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-..........<REDACTED_UUID>..........." }, disk_id: ..........<REDACTED_UUID>........... (physical_disk), policy: InService, state: Active }
     ..........<REDACTED_UUID>........... (zpool)
-    ↳ SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-..........<REDACTED_UUID>..........." }, disk_id: ..........<REDACTED_UUID>........... (physical_disk), policy: InService, state: Active }
+    SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-..........<REDACTED_UUID>..........." }, disk_id: ..........<REDACTED_UUID>........... (physical_disk), policy: InService, state: Active }
 
 
 > sled-add ..........<REDACTED_UUID>...........

illumos-utils/src/running_zone.rs

@@ -12,12 +12,13 @@ use crate::dladm::Etherstub;
 use crate::link::{Link, VnicAllocator};
 use crate::opte::{Port, PortTicket};
 use crate::svc::wait_for_service;
-use crate::zone::{AddressRequest, ZONE_PREFIX};
+use crate::zone::AddressRequest;
 use crate::zpool::{PathInPool, ZpoolName};
 use camino::{Utf8Path, Utf8PathBuf};
 use camino_tempfile::Utf8TempDir;
 use ipnetwork::IpNetwork;
 use omicron_common::backoff;
+use omicron_uuid_kinds::OmicronZoneUuid;
 pub use oxlog::is_oxide_smf_log_file;
 use slog::{error, info, o, warn, Logger};
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
@@ -26,7 +27,6 @@ use std::sync::Arc;
 use std::sync::OnceLock;
 #[cfg(target_os = "illumos")]
 use std::thread;
-use uuid::Uuid;
 
 #[cfg(any(test, feature = "testing"))]
 use crate::zone::MockZones as Zones;
@@ -947,12 +947,11 @@ impl InstalledZone {
     ///
     /// This results in a zone name which is distinct across different zpools,
     /// but stable and predictable across reboots.
-    pub fn get_zone_name(zone_type: &str, unique_name: Option<Uuid>) -> String {
-        let mut zone_name = format!("{}{}", ZONE_PREFIX, zone_type);
-        if let Some(suffix) = unique_name {
-            zone_name.push_str(&format!("_{}", suffix));
-        }
-        zone_name
+    pub fn get_zone_name(
+        zone_type: &str,
+        unique_name: Option<OmicronZoneUuid>,
+    ) -> String {
+        crate::zone::zone_name(zone_type, unique_name)
     }
 
     /// Get the name of the bootstrap VNIC in the zone, if any.
@@ -1055,7 +1054,7 @@ pub struct ZoneBuilder<'a> {
     // builder purposes - that is, skipping this field in the builder will
     // still result in an `Ok(InstalledZone)` from `.install()`, rather than
     // an `Err(InstallZoneError::IncompleteBuilder)`.
-    unique_name: Option<Uuid>,
+    unique_name: Option<OmicronZoneUuid>,
     /// ZFS datasets to be accessed from within the zone.
     datasets: Option<&'a [zone::Dataset]>,
     /// Filesystems to mount within the zone.
@@ -1119,7 +1118,7 @@ impl<'a> ZoneBuilder<'a> {
     }
 
     /// Unique ID of the instance of the zone being created. (optional)
-    pub fn with_unique_name(mut self, uuid: Uuid) -> Self {
+    pub fn with_unique_name(mut self, uuid: OmicronZoneUuid) -> Self {
         self.unique_name = Some(uuid);
         self
     }

illumos-utils/src/zone.rs

@@ -17,6 +17,7 @@ use crate::dladm::{EtherstubVnic, VNIC_PREFIX_BOOTSTRAP, VNIC_PREFIX_CONTROL};
 use crate::zpool::PathInPool;
 use crate::{execute, PFEXEC};
 use omicron_common::address::SLED_PREFIX;
+use omicron_uuid_kinds::OmicronZoneUuid;
 
 const DLADM: &str = "/usr/sbin/dladm";
 pub const IPADM: &str = "/usr/sbin/ipadm";
@@ -29,6 +30,14 @@ pub const ROUTE: &str = "/usr/sbin/route";
 pub const ZONE_PREFIX: &str = "oxz_";
 pub const PROPOLIS_ZONE_PREFIX: &str = "oxz_propolis-server_";
 
+pub fn zone_name(prefix: &str, id: Option<OmicronZoneUuid>) -> String {
+    if let Some(id) = id {
+        format!("{ZONE_PREFIX}{}_{}", prefix, id)
+    } else {
+        format!("{ZONE_PREFIX}{}", prefix)
+    }
+}
+
 #[derive(thiserror::Error, Debug)]
 enum Error {
     #[error("Zone execution error: {0}")]

live-tests/tests/test_nexus_add_remove.rs

@@ -70,7 +70,12 @@ async fn test_nexus_add_remove(lc: &LiveTestContext) {
                 .context("adding Nexus zone")?;
             assert_matches!(
                 count,
-                EnsureMultiple::Changed { added: 1, removed: 0 }
+                EnsureMultiple::Changed {
+                    added: 1,
+                    removed: 0,
+                    updated: 0,
+                    expunged: 0
+                }
             );
             Ok(())
         },