Ensures datasets get propagated into RSS blueprint

common/src/disk.rs

@@ -107,6 +107,7 @@ impl DatasetName {
         &self.pool_name
     }
 
+    // TODO: Maybe rename this to "kind"?
     pub fn dataset(&self) -> &DatasetKind {
         &self.kind
     }

nexus/src/app/rack.rs

@@ -146,7 +146,7 @@ impl super::Nexus {
                 db::model::Dataset::new(
                     dataset.dataset_id,
                     dataset.zpool_id,
-                    Some(dataset.request.address),
+                    dataset.request.address,
                     dataset.request.kind,
                 )
             })

nexus/test-utils/src/lib.rs

@@ -249,7 +249,7 @@ impl RackInitRequestBuilder {
         self.datasets.push(DatasetCreateRequest {
             zpool_id: zpool_id.into_untyped_uuid(),
             dataset_id,
-            request: DatasetPutRequest { address, kind },
+            request: DatasetPutRequest { address: Some(address), kind },
         });
         let zone = self
             .internal_dns_config
@@ -276,7 +276,7 @@ impl RackInitRequestBuilder {
             zpool_id: zpool_id.into_untyped_uuid(),
             dataset_id,
             request: DatasetPutRequest {
-                address,
+                address: Some(address),
                 kind: DatasetKind::Clickhouse,
             },
         });

nexus/types/src/deployment/zone_type.rs

@@ -14,6 +14,7 @@ use nexus_sled_agent_shared::inventory::OmicronZoneType;
 use nexus_sled_agent_shared::inventory::ZoneKind;
 use omicron_common::api::internal::shared::DatasetKind;
 use omicron_common::api::internal::shared::NetworkInterface;
+use omicron_common::disk::DatasetName;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
@@ -227,6 +228,12 @@ pub struct DurableDataset<'a> {
     pub address: SocketAddrV6,
 }
 
+impl<'a> From<DurableDataset<'a>> for DatasetName {
+    fn from(d: DurableDataset<'a>) -> Self {
+        DatasetName::new(d.dataset.pool_name.clone(), d.kind)
+    }
+}
+
 impl From<BlueprintZoneType> for OmicronZoneType {
     fn from(zone_type: BlueprintZoneType) -> Self {
         match zone_type {

nexus/types/src/internal_api/params.rs

@@ -96,7 +96,7 @@ pub struct ZpoolPutRequest {
 pub struct DatasetPutRequest {
     /// Address on which a service is responding to requests for the
     /// dataset.
-    pub address: SocketAddrV6,
+    pub address: Option<SocketAddrV6>,
 
     /// Type of dataset being inserted.
     pub kind: DatasetKind,

openapi/nexus-internal.json

@@ -3128,6 +3128,7 @@
         "type": "object",
         "properties": {
           "address": {
+            "nullable": true,
             "description": "Address on which a service is responding to requests for the dataset.",
             "type": "string"
           },
@@ -3141,7 +3142,6 @@
           }
         },
         "required": [
-          "address",
           "kind"
         ]
       },

sled-agent/src/rack_setup/plan/service.rs

@@ -34,8 +34,9 @@ use omicron_common::backoff::{
     retry_notify_ext, retry_policy_internal_service_aggressive, BackoffError,
 };
 use omicron_common::disk::{
-    DatasetKind, DatasetName, DatasetsConfig, DiskVariant,
-    OmicronPhysicalDiskConfig, OmicronPhysicalDisksConfig,
+    CompressionAlgorithm, DatasetConfig, DatasetKind, DatasetName,
+    DatasetsConfig, DiskVariant, OmicronPhysicalDiskConfig,
+    OmicronPhysicalDisksConfig,
 };
 use omicron_common::ledger::{self, Ledger, Ledgerable};
 use omicron_common::policy::{
@@ -45,7 +46,8 @@ use omicron_common::policy::{
     SINGLE_NODE_CLICKHOUSE_REDUNDANCY,
 };
 use omicron_uuid_kinds::{
-    ExternalIpUuid, GenericUuid, OmicronZoneUuid, SledUuid, ZpoolUuid,
+    DatasetUuid, ExternalIpUuid, GenericUuid, OmicronZoneUuid, SledUuid,
+    ZpoolUuid,
 };
 use rand::prelude::SliceRandom;
 use schemars::JsonSchema;
@@ -94,6 +96,9 @@ pub enum PlanError {
     #[error("Ran out of sleds / U2 storage pools")]
     NotEnoughSleds,
 
+    #[error("Unexpected dataset kind: {0}")]
+    UnexpectedDataset(String),
+
     #[error("Found only v1 service plan")]
     FoundV1,
 
@@ -119,6 +124,54 @@ pub struct SledConfig {
     pub zones: Vec<BlueprintZoneConfig>,
 }
 
+impl SledConfig {
+    /// Adds a zone to the Sled's configuration, as well as any number of
+    /// durable datasets.
+    pub fn add_zone_and_datasets(&mut self, zone: BlueprintZoneConfig) {
+        let fs_dataset_name = DatasetName::new(
+            zone.filesystem_pool.clone().expect("Missing pool"),
+            DatasetKind::TransientZone {
+                name: illumos_utils::zone::zone_name(
+                    zone.zone_type.kind().zone_prefix(),
+                    Some(zone.id),
+                ),
+            },
+        );
+
+        // Always add a transient filesystem dataset.
+        let fs_dataset = DatasetConfig {
+            id: DatasetUuid::new_v4(),
+            name: fs_dataset_name,
+            compression: CompressionAlgorithm::Off,
+            quota: None,
+            reservation: None,
+        };
+        self.datasets.datasets.insert(fs_dataset.id, fs_dataset);
+
+        // If a durable dataset exists, add it.
+        if let Some(dataset) = zone.zone_type.durable_dataset() {
+            let id = DatasetUuid::new_v4();
+            self.datasets.datasets.insert(
+                id,
+                DatasetConfig {
+                    id,
+                    name: dataset.into(),
+                    compression: CompressionAlgorithm::Off,
+                    quota: None,
+                    reservation: None,
+                },
+            );
+        }
+
+        // Add the zone.
+        //
+        // Currently this is pushing back to a Vec; we could inspect to
+        // ensure this function is idempotent, but it currently is not
+        // re-callable.
+        self.zones.push(zone);
+    }
+}
+
 #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct Plan {
     pub services: HashMap<SocketAddrV6, SledConfig>,
@@ -472,6 +525,41 @@ impl Plan {
                 .iter()
                 .map(|disk| ZpoolName::new_external(disk.pool_id))
                 .collect();
+
+            // Add all non-discretionary datasets, self-provisioned on the U.2, to the blueprint.
+            for zpool in &sled_info.u2_zpools {
+                for intrinsic_dataset in
+                    sled_storage::dataset::U2_EXPECTED_DATASETS
+                {
+                    let name = intrinsic_dataset.get_name();
+                    let kind = match name {
+                        sled_storage::dataset::ZONE_DATASET => {
+                            DatasetKind::TransientZoneRoot
+                        }
+                        sled_storage::dataset::U2_DEBUG_DATASET => {
+                            DatasetKind::Debug
+                        }
+                        _ => {
+                            return Err(PlanError::UnexpectedDataset(
+                                name.to_string(),
+                            ))
+                        }
+                    };
+
+                    let config = DatasetConfig {
+                        id: DatasetUuid::new_v4(),
+                        name: DatasetName::new(zpool.clone(), kind),
+                        compression: intrinsic_dataset.get_compression(),
+                        quota: intrinsic_dataset.get_quota(),
+                        reservation: None,
+                    };
+                    sled_info
+                        .request
+                        .datasets
+                        .datasets
+                        .insert(config.id, config);
+                }
+            }
         }
 
         // We'll stripe most services across all available Sleds, round-robin
@@ -509,7 +597,7 @@ impl Plan {
                 sled.alloc_dataset_from_u2s(DatasetKind::InternalDns)?;
             let filesystem_pool = Some(dataset_name.pool().clone());
 
-            sled.request.zones.push(BlueprintZoneConfig {
+            sled.request.add_zone_and_datasets(BlueprintZoneConfig {
                 disposition: BlueprintZoneDisposition::InService,
                 id,
                 filesystem_pool,
@@ -544,7 +632,7 @@ impl Plan {
             let dataset_name =
                 sled.alloc_dataset_from_u2s(DatasetKind::Cockroach)?;
             let filesystem_pool = Some(dataset_name.pool().clone());
-            sled.request.zones.push(BlueprintZoneConfig {
+            sled.request.add_zone_and_datasets(BlueprintZoneConfig {
                 disposition: BlueprintZoneDisposition::InService,
                 id,
                 zone_type: BlueprintZoneType::CockroachDb(
@@ -592,7 +680,7 @@ impl Plan {
             let dataset_name = sled.alloc_dataset_from_u2s(dataset_kind)?;
             let filesystem_pool = Some(dataset_name.pool().clone());
 
-            sled.request.zones.push(BlueprintZoneConfig {
+            sled.request.add_zone_and_datasets(BlueprintZoneConfig {
                 disposition: BlueprintZoneDisposition::InService,
                 id,
                 zone_type: BlueprintZoneType::ExternalDns(
@@ -629,7 +717,7 @@ impl Plan {
                 .unwrap();
             let (nic, external_ip) = svc_port_builder.next_nexus(id)?;
             let filesystem_pool = Some(sled.alloc_zpool_from_u2s()?);
-            sled.request.zones.push(BlueprintZoneConfig {
+            sled.request.add_zone_and_datasets(BlueprintZoneConfig {
                 disposition: BlueprintZoneDisposition::InService,
                 id,
                 zone_type: BlueprintZoneType::Nexus(
@@ -673,7 +761,7 @@ impl Plan {
                 .host_zone_with_one_backend(id, ServiceName::Oximeter, address)
                 .unwrap();
             let filesystem_pool = Some(sled.alloc_zpool_from_u2s()?);
-            sled.request.zones.push(BlueprintZoneConfig {
+            sled.request.add_zone_and_datasets(BlueprintZoneConfig {
                 disposition: BlueprintZoneDisposition::InService,
                 id,
                 zone_type: BlueprintZoneType::Oximeter(
@@ -701,7 +789,7 @@ impl Plan {
             let dataset_name =
                 sled.alloc_dataset_from_u2s(DatasetKind::Clickhouse)?;
             let filesystem_pool = Some(dataset_name.pool().clone());
-            sled.request.zones.push(BlueprintZoneConfig {
+            sled.request.add_zone_and_datasets(BlueprintZoneConfig {
                 disposition: BlueprintZoneDisposition::InService,
                 id,
                 zone_type: BlueprintZoneType::Clickhouse(
@@ -736,7 +824,7 @@ impl Plan {
                     address,
                 )
                 .unwrap();
-            sled.request.zones.push(BlueprintZoneConfig {
+            sled.request.add_zone_and_datasets(BlueprintZoneConfig {
                 disposition: BlueprintZoneDisposition::InService,
                 id,
                 zone_type: BlueprintZoneType::CruciblePantry(
@@ -762,7 +850,7 @@ impl Plan {
                     )
                     .unwrap();
 
-                sled.request.zones.push(BlueprintZoneConfig {
+                sled.request.add_zone_and_datasets(BlueprintZoneConfig {
                     disposition: BlueprintZoneDisposition::InService,
                     id,
                     zone_type: BlueprintZoneType::Crucible(
@@ -823,7 +911,7 @@ impl Plan {
                 .host_zone_with_one_backend(id, svcname, ntp_address)
                 .unwrap();
 
-            sled.request.zones.push(BlueprintZoneConfig {
+            sled.request.add_zone_and_datasets(BlueprintZoneConfig {
                 disposition: BlueprintZoneDisposition::InService,
                 id,
                 zone_type,