Resource Utilization

common/src/sql/dbinit.sql

@@ -39,6 +39,14 @@ CREATE DATABASE omicron;
 CREATE USER omicron;
 ALTER DEFAULT PRIVILEGES GRANT INSERT, SELECT, UPDATE, DELETE ON TABLES to omicron;
 
+-- Fleet: Represents a collection of racks
+CREATE TABLE omicron.public.fleet (
+    /* Identity metadata (asset) */
+    id UUID PRIMARY KEY,
+    time_created TIMESTAMPTZ NOT NULL,
+    time_modified TIMESTAMPTZ NOT NULL
+);
+
 /*
  * Racks
  */
@@ -48,6 +56,9 @@ CREATE TABLE omicron.public.rack (
     time_created TIMESTAMPTZ NOT NULL,
     time_modified TIMESTAMPTZ NOT NULL,
 
+    -- The fleet to which this rack belongs
+    fleet_id UUID NOT NULL,
+
     /*
      * Identifies if rack management has been transferred from RSS -> Nexus.
      * If "false", RSS is still managing sleds, services, and DNS records.
@@ -128,6 +139,29 @@ 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,
+
+    -- The amount of physical disk space which has been provisioned
+    -- on behalf of the collection.
+    physical_disk_bytes_provisioned INT8 NOT NULL,
+
+    -- The number of CPUs provisioned by VMs.
+    cpus_provisioned INT8 NOT NULL,
+
+    -- The amount of RAM provisioned by VMs.
+    ram_provisioned INT8 NOT NULL
+);
+
 /*
  * ZPools of Storage, attached to Sleds.
  * Typically these are backed by a single physical disk.
@@ -324,6 +358,7 @@ CREATE TABLE omicron.public.silo (
     time_modified TIMESTAMPTZ NOT NULL,
     time_deleted TIMESTAMPTZ,
 
+    fleet_id UUID NOT NULL,
     discoverable BOOL NOT NULL,
     authentication_mode omicron.public.authentication_mode NOT NULL,
     user_provision_type omicron.public.user_provision_type NOT NULL,

nexus/db-model/src/fleet.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/.
+
+use crate::schema::fleet;
+use db_macros::Asset;
+use nexus_types::external_api::views;
+use uuid::Uuid;
+
+/// Information about a fleet
+#[derive(Queryable, Insertable, Debug, Clone, Selectable, Asset)]
+#[diesel(table_name = fleet)]
+pub struct Fleet {
+    #[diesel(embed)]
+    pub identity: FleetIdentity,
+}
+
+impl Fleet {
+    pub fn new(id: Uuid) -> Self {
+        Self { identity: FleetIdentity::new(id) }
+    }
+}
+
+impl From<Fleet> for views::Fleet {
+    fn from(fleet: Fleet) -> Self {
+        Self { identity: views::AssetIdentityMetadata::from(&fleet) }
+    }
+}

nexus/db-model/src/lib.rs

@@ -20,6 +20,7 @@ mod digest;
 mod disk;
 mod disk_state;
 mod external_ip;
+mod fleet;
 mod generation;
 mod global_image;
 mod identity_provider;
@@ -46,6 +47,7 @@ pub mod queries;
 mod rack;
 mod region;
 mod region_snapshot;
+mod resource_usage;
 mod role_assignment;
 mod role_builtin;
 pub mod saga_types;
@@ -91,6 +93,7 @@ pub use digest::*;
 pub use disk::*;
 pub use disk_state::*;
 pub use external_ip::*;
+pub use fleet::*;
 pub use generation::*;
 pub use global_image::*;
 pub use identity_provider::*;
@@ -112,6 +115,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,44 @@
+// 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;
+use crate::schema::silo;
+
+table! {
+    parent_org {
+        id -> Uuid,
+    }
+}
+
+table! {
+    parent_silo {
+        id -> Uuid,
+    }
+}
+
+table! {
+    parent_fleet {
+        id -> Uuid,
+    }
+}
+
+table! {
+    all_collections {
+        id -> Uuid,
+    }
+}
+
+diesel::allow_tables_to_appear_in_same_query!(organization, parent_org,);
+diesel::allow_tables_to_appear_in_same_query!(silo, parent_silo,);
+
+diesel::allow_tables_to_appear_in_same_query!(
+    resource_usage,
+    parent_org,
+    parent_silo,
+    parent_fleet,
+    all_collections,
+);

nexus/db-model/src/rack.rs

@@ -13,15 +13,16 @@ use uuid::Uuid;
 pub struct Rack {
     #[diesel(embed)]
     pub identity: RackIdentity,
-
+    pub fleet_id: Uuid,
     pub initialized: bool,
     pub tuf_base_url: Option<String>,
 }
 
 impl Rack {
-    pub fn new(id: Uuid) -> Self {
+    pub fn new(id: Uuid, fleet_id: Uuid) -> Self {
         Self {
             identity: RackIdentity::new(id),
+            fleet_id,
             initialized: false,
             tuf_base_url: None,
         }

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,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/.
+
+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 physical_disk_bytes_provisioned: i64,
+    pub cpus_provisioned: i64,
+    pub ram_provisioned: i64,
+}
+
+impl ResourceUsage {
+    pub fn new(id: Uuid) -> Self {
+        Self {
+            id,
+            physical_disk_bytes_provisioned: 0,
+            cpus_provisioned: 0,
+            ram_provisioned: 0,
+        }
+    }
+}

nexus/db-model/src/schema.rs

@@ -197,6 +197,7 @@ table! {
         time_modified -> Timestamptz,
         time_deleted -> Nullable<Timestamptz>,
 
+        fleet_id -> Uuid,
         discoverable -> Bool,
         authentication_mode -> crate::AuthenticationModeEnum,
         user_provision_type -> crate::UserProvisionTypeEnum,
@@ -350,11 +351,20 @@ table! {
     }
 }
 
+table! {
+    fleet (id) {
+        id -> Uuid,
+        time_created -> Timestamptz,
+        time_modified -> Timestamptz,
+    }
+}
+
 table! {
     rack (id) {
         id -> Uuid,
         time_created -> Timestamptz,
         time_modified -> Timestamptz,
+        fleet_id -> Uuid,
         initialized -> Bool,
         tuf_base_url -> Nullable<Text>,
     }
@@ -397,6 +407,15 @@ table! {
     }
 }
 
+table! {
+    resource_usage {
+        id -> Uuid,
+        physical_disk_bytes_provisioned -> Int8,
+        cpus_provisioned -> Int8,
+        ram_provisioned -> Int8,
+    }
+}
+
 table! {
     zpool (id) {
         id -> Uuid,

nexus/db-model/src/silo.rs

@@ -85,6 +85,7 @@ pub struct Silo {
     #[diesel(embed)]
     identity: SiloIdentity,
 
+    pub fleet_id: Uuid,
     pub discoverable: bool,
 
     pub authentication_mode: AuthenticationMode,
@@ -96,13 +97,18 @@ pub struct Silo {
 
 impl Silo {
     /// Creates a new database Silo object.
-    pub fn new(params: params::SiloCreate) -> Self {
-        Self::new_with_id(Uuid::new_v4(), params)
+    pub fn new(params: params::SiloCreate, fleet_id: Uuid) -> Self {
+        Self::new_with_id(Uuid::new_v4(), params, fleet_id)
     }
 
-    pub fn new_with_id(id: Uuid, params: params::SiloCreate) -> Self {
+    pub fn new_with_id(
+        id: Uuid,
+        params: params::SiloCreate,
+        fleet_id: Uuid,
+    ) -> Self {
         Self {
             identity: SiloIdentity::new(id, params.identity),
+            fleet_id,
             discoverable: params.discoverable,
             authentication_mode: params
                 .identity_mode

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(())
@@ -499,7 +503,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)
@@ -512,9 +516,9 @@ impl super::Nexus {
             .await?;
 
         // Kick off volume deletion saga(s)
-        self.volume_delete(db_snapshot.volume_id).await?;
+        self.volume_delete(opctx, project.id(), db_snapshot.volume_id).await?;
         if let Some(volume_id) = db_snapshot.destination_volume_id {
-            self.volume_delete(volume_id).await?;
+            self.volume_delete(opctx, project.id(), volume_id).await?;
         }
 
         Ok(())

nexus/src/app/instance.rs

@@ -239,7 +239,7 @@ impl super::Nexus {
         // TODO-robustness We need to figure out what to do with Destroyed
         // instances?  Presumably we need to clean them up at some point, but
         // not right away so that callers can see that they've been destroyed.
-        let (.., authz_instance, _) =
+        let (.., project, authz_instance, instance) =
             LookupPath::new(opctx, &self.db_datastore)
                 .organization_name(organization_name)
                 .project_name(project_name)
@@ -250,6 +250,15 @@ impl super::Nexus {
         self.db_datastore
             .project_delete_instance(opctx, &authz_instance)
             .await?;
+        self.db_datastore
+            .resource_usage_update_cpus_and_ram(
+                &opctx,
+                project.id(),
+                -i64::from(instance.runtime_state.ncpus.0 .0),
+                -i64::try_from(instance.runtime_state.memory.to_bytes())
+                    .unwrap(),
+            )
+            .await?;
         self.db_datastore
             .instance_delete_all_network_interfaces(opctx, &authz_instance)
             .await?;