Resource Utilization

common/src/sql/dbinit.sql

@@ -128,6 +128,21 @@ CREATE INDEX ON omicron.public.service (
     sled_id
 );
 
+/*
+ * A table describing resource usage which may be associated
+ * with a collection of objects, including:
+ * - Projects
+ * - Organizations
+ * - Silos
+ * - Fleet
+ */
+CREATE TABLE omicron.public.resource_usage (
+    /* Should match the UUID of the corresponding collection */
+    id UUID PRIMARY KEY,
+
+    disk_bytes_used INT8 NOT NULL
+);
+
 /*
  * ZPools of Storage, attached to Sleds.
  * Typically these are backed by a single physical disk.

nexus/db-model/src/lib.rs

@@ -46,6 +46,7 @@ pub mod queries;
 mod rack;
 mod region;
 mod region_snapshot;
+mod resource_usage;
 mod role_assignment;
 mod role_builtin;
 pub mod saga_types;
@@ -112,6 +113,7 @@ pub use project::*;
 pub use rack::*;
 pub use region::*;
 pub use region_snapshot::*;
+pub use resource_usage::*;
 pub use role_assignment::*;
 pub use role_builtin::*;
 pub use service::*;

nexus/db-model/src/queries/mod.rs

@@ -5,3 +5,4 @@
 //! Subqueries used in CTEs.
 
 pub mod region_allocation;
+pub mod resource_usage_update;

nexus/db-model/src/queries/resource_usage_update.rs

@@ -0,0 +1,28 @@
+// 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/.
+
+//! Describes the resource usage update CTE
+
+use crate::schema::organization;
+use crate::schema::resource_usage;
+
+table! {
+    parent_org {
+        id -> Uuid,
+    }
+}
+
+table! {
+    parent_silo {
+        id -> Uuid,
+    }
+}
+
+diesel::allow_tables_to_appear_in_same_query!(organization, parent_org,);
+
+diesel::allow_tables_to_appear_in_same_query!(
+    resource_usage,
+    parent_org,
+    parent_silo,
+);

nexus/db-model/src/region.rs

@@ -75,4 +75,9 @@ impl Region {
         // external, customer-supplied keys is a non-requirement.
         true
     }
+    pub fn size_used(&self) -> i64 {
+        self.extent_count()
+            * self.blocks_per_extent()
+            * self.block_size().to_bytes() as i64
+    }
 }

nexus/db-model/src/resource_usage.rs

@@ -0,0 +1,21 @@
+// 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::schema::resource_usage;
+use uuid::Uuid;
+
+/// Describes resource_usage for a collection
+#[derive(Selectable, Queryable, Insertable, Debug)]
+#[diesel(table_name = resource_usage)]
+pub struct ResourceUsage {
+    pub id: Uuid,
+
+    pub disk_bytes_used: i64,
+}
+
+impl ResourceUsage {
+    pub fn new(id: Uuid) -> Self {
+        Self { id, disk_bytes_used: 0 }
+    }
+}

nexus/db-model/src/schema.rs

@@ -394,6 +394,13 @@ table! {
     }
 }
 
+table! {
+    resource_usage {
+        id -> Uuid,
+        disk_bytes_used -> Int8,
+    }
+}
+
 table! {
     zpool (id) {
         id -> Uuid,

nexus/src/app/disk.rs

@@ -377,15 +377,19 @@ impl super::Nexus {
         project_name: &Name,
         disk_name: &Name,
     ) -> DeleteResult {
-        let (.., authz_disk) = LookupPath::new(opctx, &self.db_datastore)
-            .organization_name(organization_name)
-            .project_name(project_name)
-            .disk_name(disk_name)
-            .lookup_for(authz::Action::Delete)
-            .await?;
+        let (.., project, authz_disk) =
+            LookupPath::new(opctx, &self.db_datastore)
+                .organization_name(organization_name)
+                .project_name(project_name)
+                .disk_name(disk_name)
+                .lookup_for(authz::Action::Delete)
+                .await?;
 
-        let saga_params =
-            sagas::disk_delete::Params { disk_id: authz_disk.id() };
+        let saga_params = sagas::disk_delete::Params {
+            serialized_authn: authn::saga::Serialized::for_opctx(opctx),
+            project_id: project.id(),
+            disk_id: authz_disk.id(),
+        };
         self.execute_saga::<sagas::disk_delete::SagaDiskDelete>(saga_params)
             .await?;
         Ok(())
@@ -498,7 +502,7 @@ impl super::Nexus {
         // reference counting for volumes, and probably means this needs to
         // instead be a saga.
 
-        let (.., authz_snapshot, db_snapshot) =
+        let (.., project, authz_snapshot, db_snapshot) =
             LookupPath::new(opctx, &self.db_datastore)
                 .organization_name(organization_name)
                 .project_name(project_name)
@@ -511,7 +515,7 @@ impl super::Nexus {
             .await?;
 
         // Kick off volume deletion saga
-        self.volume_delete(db_snapshot.volume_id).await?;
+        self.volume_delete(opctx, project.id(), db_snapshot.volume_id).await?;
 
         Ok(())
     }

nexus/src/app/project.rs

@@ -35,6 +35,12 @@ impl super::Nexus {
             .lookup_for(authz::Action::CreateChild)
             .await?;
 
+        // TODO: We probably want to have "project creation", "resource usage
+        // creation", and "default VPC creation" co-located within a saga for
+        // atomicity.
+        //
+        // Until then, we just perform the operations sequentially.
+
         // Create a project.
         let db_project =
             db::model::Project::new(authz_org.id(), new_project.clone());
@@ -43,11 +49,6 @@ impl super::Nexus {
             .project_create(opctx, &authz_org, db_project)
             .await?;
 
-        // TODO: We probably want to have "project creation" and "default VPC
-        // creation" co-located within a saga for atomicity.
-        //
-        // Until then, we just perform the operations sequentially.
-
         // Create a default VPC associated with the project.
         // TODO-correctness We need to be using the project_id we just created.
         // project_create() should return authz::Project and we should use that

nexus/src/app/sagas/disk_create.rs

@@ -51,8 +51,16 @@ lazy_static! {
         sdc_create_disk_record,
         sdc_create_disk_record_undo
     );
-    static ref REGIONS_ALLOC: NexusAction =
-        new_action_noop_undo("disk-create.regions-alloc", sdc_alloc_regions,);
+    static ref REGIONS_ALLOC: NexusAction = ActionFunc::new_action(
+        "disk-create.allocate-regions",
+        sdc_alloc_regions,
+        sdc_alloc_regions_undo,
+    );
+    static ref REGIONS_ACCOUNT: NexusAction = ActionFunc::new_action(
+        "disk-create.account-regions",
+        sdc_account_regions,
+        sdc_account_regions_undo,
+    );
     static ref REGIONS_ENSURE: NexusAction =
         new_action_noop_undo("disk-create.regions-ensure", sdc_regions_ensure,);
     static ref CREATE_VOLUME_RECORD: NexusAction = ActionFunc::new_action(
@@ -246,6 +254,76 @@ async fn sdc_alloc_regions(
     Ok(datasets_and_regions)
 }
 
+async fn sdc_alloc_regions_undo(
+    sagactx: NexusActionContext,
+) -> Result<(), anyhow::Error> {
+    let osagactx = sagactx.user_data();
+
+    let region_ids = sagactx
+        .lookup::<Vec<(db::model::Dataset, db::model::Region)>>(
+            "datasets_and_regions",
+        )?
+        .into_iter()
+        .map(|(_, region)| region.id())
+        .collect::<Vec<Uuid>>();
+
+    osagactx.datastore().regions_hard_delete(region_ids).await?;
+    Ok(())
+}
+
+fn get_space_used_by_allocated_regions(
+    sagactx: &NexusActionContext,
+) -> Result<i64, ActionError> {
+    let space_used = sagactx
+        .lookup::<Vec<(db::model::Dataset, db::model::Region)>>(
+            "datasets_and_regions",
+        )?
+        .into_iter()
+        .map(|(_, region)| region.size_used())
+        .fold(0, |acc, x| acc + x);
+    Ok(space_used)
+}
+
+// TODO: Not yet idempotent
+async fn sdc_account_regions(
+    sagactx: NexusActionContext,
+) -> Result<(), ActionError> {
+    let osagactx = sagactx.user_data();
+    let params = sagactx.saga_params::<Params>()?;
+
+    let opctx = OpContext::for_saga_action(&sagactx, &params.serialized_authn);
+    osagactx
+        .datastore()
+        .resource_usage_update_disk(
+            &opctx,
+            params.project_id,
+            get_space_used_by_allocated_regions(&sagactx)?,
+        )
+        .await
+        .map_err(ActionError::action_failed)?;
+    Ok(())
+}
+
+// TODO: Not yet idempotent
+async fn sdc_account_regions_undo(
+    sagactx: NexusActionContext,
+) -> Result<(), anyhow::Error> {
+    let osagactx = sagactx.user_data();
+    let params = sagactx.saga_params::<Params>()?;
+
+    let opctx = OpContext::for_saga_action(&sagactx, &params.serialized_authn);
+    osagactx
+        .datastore()
+        .resource_usage_update_disk(
+            &opctx,
+            params.project_id,
+            -get_space_used_by_allocated_regions(&sagactx)?,
+        )
+        .await
+        .map_err(ActionError::action_failed)?;
+    Ok(())
+}
+
 /// Call out to Crucible agent and perform region creation.
 async fn ensure_region_in_dataset(
     log: &Logger,
@@ -560,9 +638,14 @@ async fn sdc_create_volume_record_undo(
     sagactx: NexusActionContext,
 ) -> Result<(), anyhow::Error> {
     let osagactx = sagactx.user_data();
+    let params = sagactx.saga_params::<Params>()?;
 
+    let opctx = OpContext::for_saga_action(&sagactx, &params.serialized_authn);
     let volume_id = sagactx.lookup::<Uuid>("volume_id")?;
-    osagactx.nexus().volume_delete(volume_id).await?;
+    osagactx
+        .nexus()
+        .volume_delete(&opctx, params.project_id, volume_id)
+        .await?;
     Ok(())
 }
 

nexus/src/app/sagas/disk_delete.rs

@@ -6,6 +6,8 @@ use super::ActionRegistry;
 use super::NexusActionContext;
 use super::NexusSaga;
 use crate::app::sagas::NexusAction;
+use crate::authn;
+use crate::context::OpContext;
 use lazy_static::lazy_static;
 use serde::Deserialize;
 use serde::Serialize;
@@ -19,6 +21,8 @@ use uuid::Uuid;
 
 #[derive(Debug, Deserialize, Serialize)]
 pub struct Params {
+    pub serialized_authn: authn::saga::Serialized,
+    pub project_id: Uuid,
     pub disk_id: Uuid,
 }
 
@@ -89,10 +93,12 @@ async fn sdd_delete_volume(
     sagactx: NexusActionContext,
 ) -> Result<(), ActionError> {
     let osagactx = sagactx.user_data();
+    let params = sagactx.saga_params::<Params>()?;
+    let opctx = OpContext::for_saga_action(&sagactx, &params.serialized_authn);
     let volume_id = sagactx.lookup::<Uuid>("volume_id")?;
     osagactx
         .nexus()
-        .volume_delete(volume_id)
+        .volume_delete(&opctx, params.project_id, volume_id)
         .await
         .map_err(ActionError::action_failed)?;
     Ok(())

nexus/src/app/sagas/snapshot_create.rs

@@ -584,10 +584,15 @@ async fn ssc_create_volume_record_undo(
 ) -> Result<(), anyhow::Error> {
     let log = sagactx.user_data().log();
     let osagactx = sagactx.user_data();
+    let params = sagactx.saga_params::<Params>()?;
+    let opctx = OpContext::for_saga_action(&sagactx, &params.serialized_authn);
     let volume_id = sagactx.lookup::<Uuid>("volume_id")?;
 
     info!(log, "deleting volume {}", volume_id);
-    osagactx.nexus().volume_delete(volume_id).await?;
+    osagactx
+        .nexus()
+        .volume_delete(&opctx, params.project_id, volume_id)
+        .await?;
 
     Ok(())
 }

nexus/src/app/sagas/volume_delete.rs

@@ -28,6 +28,8 @@ use super::NexusActionContext;
 use super::NexusSaga;
 use super::MAX_CONCURRENT_REGION_REQUESTS;
 use crate::app::sagas::NexusAction;
+use crate::authn;
+use crate::context::OpContext;
 use crate::db;
 use crate::db::datastore::CrucibleResources;
 use crucible_agent_client::{types::RegionId, Client as CrucibleAgentClient};
@@ -47,6 +49,8 @@ use uuid::Uuid;
 
 #[derive(Debug, Deserialize, Serialize)]
 pub struct Params {
+    pub serialized_authn: authn::saga::Serialized,
+    pub project_id: Uuid,
     pub volume_id: Uuid,
 }
 
@@ -171,6 +175,7 @@ async fn svd_delete_crucible_regions(
     sagactx: NexusActionContext,
 ) -> Result<(), ActionError> {
     let osagactx = sagactx.user_data();
+    let params = sagactx.saga_params::<Params>()?;
 
     let crucible_resources_to_delete =
         sagactx.lookup::<CrucibleResources>("crucible_resources_to_delete")?;
@@ -191,6 +196,23 @@ async fn svd_delete_crucible_regions(
                 .map(|(_, r)| r.id())
                 .collect();
 
+            // TODO: This accounting is not yet idempotent
+            let space_used = crucible_resources_to_delete
+                .datasets_and_regions
+                .iter()
+                .fold(0, |acc, (_, r)| acc + r.size_used());
+            let opctx =
+                OpContext::for_saga_action(&sagactx, &params.serialized_authn);
+            osagactx
+                .datastore()
+                .resource_usage_update_disk(
+                    &opctx,
+                    params.project_id,
+                    -space_used,
+                )
+                .await
+                .map_err(ActionError::action_failed)?;
+
             osagactx
                 .datastore()
                 .regions_hard_delete(region_ids_to_delete)