merge

Author: smklein

.github/buildomat/jobs/deploy.sh

@@ -343,7 +343,7 @@ E2E_TLS_CERT="/opt/oxide/sled-agent/pkg/initial-tls-cert.pem"
 #
 pfexec mkdir -p /usr/oxide
 pfexec curl -sSfL -o /usr/oxide/oxide \
-	http://catacomb.eng.oxide.computer:12346/oxide-v0.1.1
+	http://catacomb.eng.oxide.computer:12346/oxide-v2025112000
 pfexec chmod +x /usr/oxide/oxide
 
 curl -sSfL -o debian-11-genericcloud-amd64.raw \

Cargo.lock

@@ -593,7 +593,16 @@ impl Display for ByteCount {
 }
 
 // TODO-cleanup This could use the experimental std::num::IntErrorKind.
-#[derive(Debug, Eq, thiserror::Error, Ord, PartialEq, PartialOrd)]
+#[derive(
+    Debug,
+    Eq,
+    thiserror::Error,
+    Ord,
+    PartialEq,
+    PartialOrd,
+    Serialize,
+    Deserialize,
+)]
 pub enum ByteCountRangeError {
     #[error("value is too small for a byte count")]
     TooSmall,
@@ -1424,7 +1433,8 @@ impl SimpleIdentityOrName for AntiAffinityGroupMember {
 #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum DiskType {
-    Crucible,
+    Distributed,
+    Local,
 }
 
 /// View of a Disk

common/src/api/external/mod.rs

@@ -315,6 +315,7 @@ fn all_apis() -> anyhow::Result<ManagedApis> {
     let apis = ManagedApis::new(apis)
         .context("error creating ManagedApis")?
         .with_validation(validate);
+
     Ok(apis)
 }
 

dev-tools/dropshot-apis/src/main.rs

@@ -120,6 +120,7 @@ use nexus_db_queries::db::datastore::CrucibleTargets;
 use nexus_db_queries::db::datastore::Disk;
 use nexus_db_queries::db::datastore::InstanceAndActiveVmm;
 use nexus_db_queries::db::datastore::InstanceStateComputer;
+use nexus_db_queries::db::datastore::LocalStorageDisk;
 use nexus_db_queries::db::datastore::SQL_BATCH_SIZE;
 use nexus_db_queries::db::datastore::VolumeCookedResult;
 use nexus_db_queries::db::datastore::read_only_resources_associated_with_volume;
@@ -152,6 +153,7 @@ use omicron_common::api::external::MacAddr;
 use omicron_uuid_kinds::CollectionUuid;
 use omicron_uuid_kinds::DatasetUuid;
 use omicron_uuid_kinds::DownstairsRegionUuid;
+use omicron_uuid_kinds::ExternalZpoolUuid;
 use omicron_uuid_kinds::GenericUuid;
 use omicron_uuid_kinds::InstanceUuid;
 use omicron_uuid_kinds::ParseError;
@@ -2225,8 +2227,7 @@ async fn crucible_disk_info(
             }
         }
     } else {
-        // If the disk is not attached to anything, just print empty
-        // fields.
+        // If the disk is not attached to anything, just print empty fields.
         UpstairsRow {
             host_serial: "-".to_string(),
             disk_name,
@@ -2286,6 +2287,141 @@ async fn crucible_disk_info(
     Ok(())
 }
 
+async fn local_storage_disk_info(
+    opctx: &OpContext,
+    datastore: &DataStore,
+    disk: LocalStorageDisk,
+) -> Result<(), anyhow::Error> {
+    #[derive(Tabled)]
+    #[tabled(rename_all = "SCREAMING_SNAKE_CASE")]
+    struct GenericRow {
+        host_serial: String,
+        disk_name: String,
+        instance_name: String,
+        propolis_zone: String,
+        disk_state: String,
+    }
+
+    let conn = datastore.pool_connection_for_tests().await?;
+
+    let disk_name = disk.name().to_string();
+    let disk_state = disk.runtime().disk_state.to_string();
+
+    let row = if let Some(instance_uuid) = disk.runtime().attach_instance_id {
+        // Get the instance this disk is attached to
+        use nexus_db_schema::schema::instance::dsl as instance_dsl;
+        use nexus_db_schema::schema::vmm::dsl as vmm_dsl;
+        let instances: Vec<InstanceAndActiveVmm> = instance_dsl::instance
+            .filter(instance_dsl::id.eq(instance_uuid))
+            .left_join(
+                vmm_dsl::vmm.on(vmm_dsl::id
+                    .nullable()
+                    .eq(instance_dsl::active_propolis_id)
+                    .and(vmm_dsl::time_deleted.is_null())),
+            )
+            .limit(1)
+            .select((Instance::as_select(), Option::<Vmm>::as_select()))
+            .load_async(&*conn)
+            .await
+            .context("loading requested instance")?
+            .into_iter()
+            .map(|i: (Instance, Option<Vmm>)| i.into())
+            .collect();
+
+        let Some(instance) = instances.into_iter().next() else {
+            bail!("no instance: {} found", instance_uuid);
+        };
+
+        let instance_name = instance.instance().name().to_string();
+
+        if instance.vmm().is_some() {
+            let propolis_id =
+                instance.instance().runtime().propolis_id.unwrap();
+            let my_sled_id = instance.sled_id().unwrap();
+
+            let (_, my_sled) = LookupPath::new(opctx, datastore)
+                .sled_id(my_sled_id)
+                .fetch()
+                .await
+                .context("failed to look up sled")?;
+
+            GenericRow {
+                host_serial: my_sled.serial_number().to_string(),
+                disk_name,
+                instance_name,
+                propolis_zone: format!("oxz_propolis-server_{}", propolis_id),
+                disk_state,
+            }
+        } else {
+            GenericRow {
+                host_serial: NOT_ON_SLED_MSG.to_string(),
+                disk_name,
+                instance_name,
+                propolis_zone: NO_ACTIVE_PROPOLIS_MSG.to_string(),
+                disk_state,
+            }
+        }
+    } else {
+        // If the disk is not attached to anything, just print empty fields.
+        GenericRow {
+            host_serial: "-".to_string(),
+            disk_name,
+            instance_name: "-".to_string(),
+            propolis_zone: "-".to_string(),
+            disk_state,
+        }
+    };
+
+    let table = tabled::Table::new(vec![row])
+        .with(tabled::settings::Style::empty())
+        .with(tabled::settings::Padding::new(0, 1, 0, 0))
+        .to_string();
+
+    println!("{}", table);
+
+    #[derive(Tabled)]
+    #[tabled(rename_all = "SCREAMING_SNAKE_CASE")]
+    struct Row {
+        disk_name: String,
+
+        time_created: DateTime<Utc>,
+        #[tabled(display_with = "display_option_blank")]
+        time_deleted: Option<DateTime<Utc>>,
+
+        dataset_id: DatasetUuid,
+        pool_id: ExternalZpoolUuid,
+        sled_id: SledUuid,
+
+        dataset_size: u64,
+    }
+
+    if let Some(allocation) = &disk.local_storage_dataset_allocation {
+        let rows = vec![Row {
+            disk_name: disk.name().to_string(),
+
+            time_created: allocation.time_created,
+            time_deleted: allocation.time_deleted,
+
+            dataset_id: allocation.local_storage_dataset_id(),
+            pool_id: allocation.pool_id(),
+            sled_id: allocation.sled_id(),
+
+            dataset_size: allocation.dataset_size.to_bytes(),
+        }];
+
+        let table = tabled::Table::new(rows)
+            .with(tabled::settings::Style::empty())
+            .with(tabled::settings::Padding::new(0, 1, 0, 0))
+            .to_string();
+
+        println!("{}", table);
+    } else {
+        println!("no allocation yet");
+    }
+
+    Ok(())
+}
+
 /// Run `omdb db disk info <UUID>`.
 async fn cmd_db_disk_info(
     opctx: &OpContext,
@@ -2296,6 +2432,9 @@ async fn cmd_db_disk_info(
         Disk::Crucible(disk) => {
             crucible_disk_info(opctx, datastore, disk).await
         }
+        Disk::LocalStorage(disk) => {
+            local_storage_disk_info(opctx, datastore, disk).await
+        }
     }
 }
 

dev-tools/omdb/src/bin/omdb/db.rs

@@ -6,8 +6,8 @@ use end_to_end_tests::helpers::{
 use omicron_test_utils::dev::poll::{CondCheckError, wait_for_condition};
 use oxide_client::types::{
     ByteCount, DeviceAccessTokenRequest, DeviceAuthRequest, DeviceAuthVerify,
-    DiskCreate, DiskSource, IpPoolCreate, IpPoolLinkSilo, IpPoolType,
-    IpVersion, NameOrId, SiloQuotasUpdate,
+    DiskBackend, DiskCreate, DiskSource, IpPoolCreate, IpPoolLinkSilo,
+    IpPoolType, IpVersion, NameOrId, SiloQuotasUpdate,
 };
 use oxide_client::{
     ClientConsoleAuthExt, ClientDisksExt, ClientProjectsExt,
@@ -98,9 +98,9 @@ async fn run_test() -> Result<()> {
                 .body(DiskCreate {
                     name: disk_name.clone(),
                     description: String::new(),
-                    disk_source: DiskSource::Blank {
+                    disk_backend: DiskBackend::Distributed(DiskSource::Blank {
                         block_size: 512.try_into().unwrap(),
-                    },
+                    }),
                     size: ByteCount(1024 * 1024 * 1024),
                 })
                 .send()

end-to-end-tests/src/bin/bootstrap.rs

@@ -5,8 +5,8 @@ use anyhow::{Context as _, Result, ensure};
 use async_trait::async_trait;
 use omicron_test_utils::dev::poll::{CondCheckError, wait_for_condition};
 use oxide_client::types::{
-    ByteCount, DiskCreate, DiskSource, ExternalIp, ExternalIpCreate,
-    InstanceCpuCount, InstanceCreate, InstanceDiskAttachment,
+    ByteCount, DiskBackend, DiskCreate, DiskSource, ExternalIp,
+    ExternalIpCreate, InstanceCpuCount, InstanceCreate, InstanceDiskAttachment,
     InstanceNetworkInterfaceAttachment, InstanceState, SshKeyCreate,
 };
 use oxide_client::{ClientCurrentUserExt, ClientDisksExt, ClientInstancesExt};
@@ -45,9 +45,9 @@ async fn instance_launch() -> Result<()> {
         .body(DiskCreate {
             name: disk_name.clone(),
             description: String::new(),
-            disk_source: DiskSource::Image {
+            disk_backend: DiskBackend::Distributed(DiskSource::Image {
                 image_id: ctx.get_silo_image_id("debian11").await?,
-            },
+            }),
             size: ByteCount(2048 * 1024 * 1024),
         })
         .send()

end-to-end-tests/src/instance_launch.rs

@@ -26,6 +26,7 @@ impl_enum_type!(
 
     // Enum values
     Crucible => b"crucible"
+    LocalStorage => b"local_storage"
 );
 
 /// A Disk, where how the blocks are stored depend on the disk_type.
@@ -75,7 +76,8 @@ pub struct Disk {
     /// (where rows are matched based on the disk_id field in that table) and
     /// combined into a higher level `datastore::Disk` enum.
     ///
-    /// For `Crucible` disks, see the DiskTypeCrucible model.
+    /// For `Crucible` disks, see the DiskTypeCrucible model. For `LocalStorage`
+    /// disks, see the DiskTypeLocalStorage model.
     pub disk_type: DiskType,
 }
 

nexus/db-model/src/disk.rs

@@ -43,16 +43,16 @@ impl DiskTypeCrucible {
     pub fn new(
         disk_id: Uuid,
         volume_id: VolumeUuid,
-        params: &params::DiskCreate,
+        disk_source: &params::DiskSource,
     ) -> Self {
-        let create_snapshot_id = match params.disk_source {
-            params::DiskSource::Snapshot { snapshot_id } => Some(snapshot_id),
+        let create_snapshot_id = match disk_source {
+            params::DiskSource::Snapshot { snapshot_id } => Some(*snapshot_id),
             _ => None,
         };
 
         // XXX further enum here for different image types?
-        let create_image_id = match params.disk_source {
-            params::DiskSource::Image { image_id } => Some(image_id),
+        let create_image_id = match disk_source {
+            params::DiskSource::Image { image_id } => Some(*image_id),
             _ => None,
         };
 

nexus/db-model/src/disk_type_crucible.rs

@@ -0,0 +1,68 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+use crate::ByteCount;
+use crate::typed_uuid::DbTypedUuid;
+use nexus_db_schema::schema::disk_type_local_storage;
+use omicron_common::api::external;
+use omicron_uuid_kinds::DatasetKind;
+use omicron_uuid_kinds::DatasetUuid;
+use serde::{Deserialize, Serialize};
+use uuid::Uuid;
+
+/// A Disk can be backed using a zvol slice from the local storage dataset
+/// present on each zpool of a sled.
+#[derive(
+    Queryable, Insertable, Clone, Debug, Selectable, Serialize, Deserialize,
+)]
+#[diesel(table_name = disk_type_local_storage)]
+pub struct DiskTypeLocalStorage {
+    disk_id: Uuid,
+
+    /// For zvols inside a parent dataset, there's an overhead that must be
+    /// accounted for when setting a quota and reservation on that parent
+    /// dataset. Record at model creation time how much overhead is required for
+    /// the parent `local_storage` dataset slice in order to fit the child
+    /// volume.
+    required_dataset_overhead: ByteCount,
+
+    local_storage_dataset_allocation_id: Option<DbTypedUuid<DatasetKind>>,
+}
+
+impl DiskTypeLocalStorage {
+    /// Creates a new `DiskTypeLocalStorage`. Returns Err if the computed
+    /// required dataset overhead does not fit in a `ByteCount`.
+    pub fn new(
+        disk_id: Uuid,
+        size: external::ByteCount,
+    ) -> Result<DiskTypeLocalStorage, external::ByteCountRangeError> {
+        // For zvols, there's an overhead that must be accounted for, and it
+        // empirically seems to be about 65M per 1G for volblocksize=4096.
+        // Multiple the disk size by something a little over this value.
+
+        let one_gb = external::ByteCount::from_gibibytes_u32(1).to_bytes();
+        let gbs = size.to_bytes() / one_gb;
+        let overhead: u64 =
+            external::ByteCount::from_mebibytes_u32(70).to_bytes() * gbs;
+
+        // Don't unwrap this - the size of this disk is a parameter set by an
+        // API call, and we don't want to panic on out of range input.
+        let required_dataset_overhead =
+            external::ByteCount::try_from(overhead)?;
+
+        Ok(DiskTypeLocalStorage {
+            disk_id,
+            required_dataset_overhead: required_dataset_overhead.into(),
+            local_storage_dataset_allocation_id: None,
+        })
+    }
+
+    pub fn required_dataset_overhead(&self) -> external::ByteCount {
+        self.required_dataset_overhead.into()
+    }
+
+    pub fn local_storage_dataset_allocation_id(&self) -> Option<DatasetUuid> {
+        self.local_storage_dataset_allocation_id.map(Into::into)
+    }
+}