(7/5) [nexus-db-queries] Benchmark for VMM reservation

common/src/api/external/http_pagination.rs

@@ -312,6 +312,19 @@ pub type PaginatedByNameOrId<Selector = ()> = PaginationParams<
 pub type PageSelectorByNameOrId<Selector = ()> =
     PageSelector<ScanByNameOrId<Selector>, NameOrId>;
 
+pub fn id_pagination<'a, Selector>(
+    pag_params: &'a DataPageParams<Uuid>,
+    scan_params: &'a ScanById<Selector>,
+) -> Result<PaginatedBy<'a>, HttpError>
+where
+    Selector:
+        Clone + Debug + DeserializeOwned + JsonSchema + PartialEq + Serialize,
+{
+    match scan_params.sort_by {
+        IdSortMode::IdAscending => Ok(PaginatedBy::Id(pag_params.clone())),
+    }
+}
+
 pub fn name_or_id_pagination<'a, Selector>(
     pag_params: &'a DataPageParams<NameOrId>,
     scan_params: &'a ScanByNameOrId<Selector>,

common/src/api/external/mod.rs

@@ -293,6 +293,12 @@ impl<'a> From<&'a Name> for &'a str {
     }
 }
 
+impl From<Name> for String {
+    fn from(name: Name) -> Self {
+        name.0
+    }
+}
+
 /// `Name` instances are comparable like Strings, primarily so that they can
 /// be used as keys in trees.
 impl<S> PartialEq<S> for Name
@@ -1335,7 +1341,9 @@ pub enum InstanceAutoRestartPolicy {
 /// Affinity policy used to describe "what to do when a request cannot be satisfied"
 ///
 /// Used for both Affinity and Anti-Affinity Groups
-#[derive(Clone, Copy, Debug, Deserialize, Serialize, PartialEq, JsonSchema)]
+#[derive(
+    Clone, Copy, Debug, Deserialize, Hash, Eq, Serialize, PartialEq, JsonSchema,
+)]
 #[serde(rename_all = "snake_case")]
 pub enum AffinityPolicy {
     /// If the affinity request cannot be satisfied, allow it anyway.

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

@@ -6403,7 +6403,7 @@ async fn cmd_db_vmm_info(
     &VmmInfoArgs { uuid }: &VmmInfoArgs,
 ) -> Result<(), anyhow::Error> {
     use db::schema::migration::dsl as migration_dsl;
-    use db::schema::sled_resource::dsl as resource_dsl;
+    use db::schema::sled_resource_vmm::dsl as resource_dsl;
     use db::schema::vmm::dsl as vmm_dsl;
 
     let vmm = vmm_dsl::vmm
@@ -6439,14 +6439,13 @@ async fn cmd_db_vmm_info(
     );
 
     fn prettyprint_reservation(
-        resource: db::model::SledResource,
+        resource: db::model::SledResourceVmm,
         include_sled_id: bool,
     ) {
         use db::model::ByteCount;
-        let db::model::SledResource {
+        let db::model::SledResourceVmm {
             id: _,
             sled_id,
-            kind: _,
             resources:
                 db::model::Resources {
                     hardware_threads,
@@ -6468,10 +6467,10 @@ async fn cmd_db_vmm_info(
         println!("    {RESERVOIR:>WIDTH$}: {reservoir}");
     }
 
-    let reservations = resource_dsl::sled_resource
+    let reservations = resource_dsl::sled_resource_vmm
         .filter(resource_dsl::id.eq(uuid))
-        .select(db::model::SledResource::as_select())
-        .load_async::<db::model::SledResource>(
+        .select(db::model::SledResourceVmm::as_select())
+        .load_async::<db::model::SledResourceVmm>(
             &*datastore.pool_connection_for_tests().await?,
         )
         .await

nexus/auth/src/authz/api_resources.rs

@@ -714,6 +714,22 @@ authz_resource! {
     polar_snippet = InProject,
 }
 
+authz_resource! {
+    name = "AffinityGroup",
+    parent = "Project",
+    primary_key = Uuid,
+    roles_allowed = false,
+    polar_snippet = InProject,
+}
+
+authz_resource! {
+    name = "AntiAffinityGroup",
+    parent = "Project",
+    primary_key = Uuid,
+    roles_allowed = false,
+    polar_snippet = InProject,
+}
+
 authz_resource! {
     name = "InstanceNetworkInterface",
     parent = "Instance",

nexus/auth/src/authz/oso_generic.rs

@@ -125,6 +125,8 @@ pub fn make_omicron_oso(log: &slog::Logger) -> Result<OsoInit, anyhow::Error> {
         Disk::init(),
         Snapshot::init(),
         ProjectImage::init(),
+        AffinityGroup::init(),
+        AntiAffinityGroup::init(),
         Instance::init(),
         IpPool::init(),
         InstanceNetworkInterface::init(),

nexus/db-model/src/lib.rs

@@ -92,8 +92,7 @@ mod silo_user_password_hash;
 mod sled;
 mod sled_instance;
 mod sled_policy;
-mod sled_resource;
-mod sled_resource_kind;
+mod sled_resource_vmm;
 mod sled_state;
 mod sled_underlay_subnet_allocation;
 mod snapshot;
@@ -203,8 +202,7 @@ pub use silo_user_password_hash::*;
 pub use sled::*;
 pub use sled_instance::*;
 pub use sled_policy::to_db_sled_policy; // Do not expose DbSledPolicy
-pub use sled_resource::*;
-pub use sled_resource_kind::*;
+pub use sled_resource_vmm::*;
 pub use sled_state::*;
 pub use sled_underlay_subnet_allocation::*;
 pub use snapshot::*;

nexus/db-model/src/schema.rs

@@ -954,13 +954,12 @@ table! {
 }
 
 table! {
-    sled_resource (id) {
+    sled_resource_vmm (id) {
         id -> Uuid,
         sled_id -> Uuid,
         hardware_threads -> Int8,
         rss_ram -> Int8,
         reservoir_ram -> Int8,
-        kind -> crate::SledResourceKindEnum,
         instance_id -> Nullable<Uuid>,
     }
 }
@@ -2103,7 +2102,7 @@ allow_tables_to_appear_in_same_query!(
     identity_provider,
     console_session,
     sled,
-    sled_resource,
+    sled_resource_vmm,
     support_bundle,
     router_route,
     vmm,

nexus/db-model/src/schema_versions.rs

@@ -16,7 +16,7 @@ use std::{collections::BTreeMap, sync::LazyLock};
 ///
 /// This must be updated when you change the database schema.  Refer to
 /// schema/crdb/README.adoc in the root of this repository for details.
-pub const SCHEMA_VERSION: SemverVersion = SemverVersion::new(126, 0, 0);
+pub const SCHEMA_VERSION: SemverVersion = SemverVersion::new(127, 0, 0);
 
 /// List of all past database schema versions, in *reverse* order
 ///
@@ -28,6 +28,7 @@ static KNOWN_VERSIONS: LazyLock<Vec<KnownVersion>> = LazyLock::new(|| {
         // |  leaving the first copy as an example for the next person.
         // v
         // KnownVersion::new(next_int, "unique-dirname-with-the-sql-files"),
+        KnownVersion::new(127, "sled-resource-for-vmm"),
         KnownVersion::new(126, "affinity"),
         KnownVersion::new(125, "blueprint-disposition-expunged-cleanup"),
         KnownVersion::new(124, "support-read-only-region-replacement"),

nexus/db-model/src/sled_resource.rs → nexus/db-model/src/sled_resource_vmm.rs

@@ -2,22 +2,22 @@
 // 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::sled_resource;
+use crate::schema::sled_resource_vmm;
 use crate::typed_uuid::DbTypedUuid;
-use crate::{ByteCount, SledResourceKind, SqlU32};
-use omicron_uuid_kinds::GenericUuid;
+use crate::{ByteCount, SqlU32};
 use omicron_uuid_kinds::InstanceKind;
 use omicron_uuid_kinds::InstanceUuid;
+use omicron_uuid_kinds::PropolisKind;
 use omicron_uuid_kinds::PropolisUuid;
 use omicron_uuid_kinds::SledKind;
 use omicron_uuid_kinds::SledUuid;
-use uuid::Uuid;
 
 type DbInstanceUuid = DbTypedUuid<InstanceKind>;
+type DbPropolisUuid = DbTypedUuid<PropolisKind>;
 type DbSledUuid = DbTypedUuid<SledKind>;
 
 #[derive(Clone, Selectable, Queryable, Insertable, Debug)]
-#[diesel(table_name = sled_resource)]
+#[diesel(table_name = sled_resource_vmm)]
 pub struct Resources {
     pub hardware_threads: SqlU32,
     pub rss_ram: ByteCount,
@@ -34,32 +34,30 @@ impl Resources {
     }
 }
 
-/// Describes sled resource usage by services
+/// Describes sled resource usage by a VMM
 #[derive(Clone, Selectable, Queryable, Insertable, Debug)]
-#[diesel(table_name = sled_resource)]
-pub struct SledResource {
-    pub id: Uuid,
+#[diesel(table_name = sled_resource_vmm)]
+pub struct SledResourceVmm {
+    pub id: DbPropolisUuid,
     pub sled_id: DbSledUuid,
 
     #[diesel(embed)]
     pub resources: Resources,
 
-    pub kind: SledResourceKind,
     pub instance_id: Option<DbInstanceUuid>,
 }
 
-impl SledResource {
-    pub fn new_for_vmm(
+impl SledResourceVmm {
+    pub fn new(
         id: PropolisUuid,
         instance_id: InstanceUuid,
         sled_id: SledUuid,
         resources: Resources,
     ) -> Self {
         Self {
-            id: id.into_untyped_uuid(),
+            id: id.into(),
             instance_id: Some(instance_id.into()),
             sled_id: sled_id.into(),
-            kind: SledResourceKind::Instance,
             resources,
         }
     }

nexus/db-queries/Cargo.toml

@@ -25,6 +25,7 @@ futures.workspace = true
 internal-dns-resolver.workspace = true
 internal-dns-types.workspace = true
 ipnetwork.workspace = true
+itertools.workspace = true
 macaddr.workspace = true
 oxnet.workspace = true
 paste.workspace = true
@@ -74,6 +75,7 @@ testing = ["omicron-test-utils"]
 [dev-dependencies]
 assert_matches.workspace = true
 camino-tempfile.workspace = true
+criterion.workspace = true
 expectorate.workspace = true
 hyper-rustls.workspace = true
 gateway-client.workspace = true
@@ -84,7 +86,7 @@ nexus-inventory.workspace = true
 nexus-reconfigurator-planning.workspace = true
 nexus-test-utils.workspace = true
 omicron-sled-agent.workspace = true
-omicron-test-utils.workspace = true
+omicron-test-utils = { workspace = true, features = ["seed-gen"] }
 openapiv3.workspace = true
 oso.workspace = true
 pem.workspace = true
@@ -96,3 +98,7 @@ regex.workspace = true
 rustls.workspace = true
 subprocess.workspace = true
 term.workspace = true
+
+[[bench]]
+name = "sled_reservation"
+harness = false