Add CRDB schema changes and queries required for trust quorum

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

@@ -78,7 +78,6 @@ use nexus_types::internal_api::background::TufArtifactReplicationCounters;
 use nexus_types::internal_api::background::TufArtifactReplicationRequest;
 use nexus_types::internal_api::background::TufArtifactReplicationStatus;
 use nexus_types::internal_api::background::TufRepoPrunerStatus;
-use nexus_types::inventory::BaseboardId;
 use omicron_uuid_kinds::BlueprintUuid;
 use omicron_uuid_kinds::CollectionUuid;
 use omicron_uuid_kinds::DemoSagaUuid;
@@ -92,6 +91,7 @@ use quiesce::cmd_nexus_quiesce;
 use reconfigurator_config::ReconfiguratorConfigArgs;
 use reconfigurator_config::cmd_nexus_reconfigurator_config;
 use serde::Deserialize;
+use sled_agent_types::sled::BaseboardId;
 use slog_error_chain::InlineErrorChain;
 use std::collections::BTreeMap;
 use std::collections::BTreeSet;

dev-tools/reconfigurator-sp-updater/Cargo.toml

@@ -25,6 +25,7 @@ omicron-repl-utils.workspace = true
 oxide-tokio-rt.workspace = true
 qorb.workspace = true
 serde_json.workspace = true
+sled-agent-types.workspace = true
 slog.workspace = true
 swrite.workspace = true
 tokio = { workspace = true, features = [ "full" ] }

dev-tools/reconfigurator-sp-updater/src/main.rs

@@ -26,12 +26,12 @@ use nexus_types::deployment::PendingMgsUpdateRotDetails;
 use nexus_types::deployment::PendingMgsUpdateSpDetails;
 use nexus_types::deployment::PendingMgsUpdates;
 use nexus_types::internal_api::views::MgsUpdateDriverStatus;
-use nexus_types::inventory::BaseboardId;
 use nexus_types::inventory::SpType;
 use omicron_common::disk::M2Slot;
 use omicron_repl_utils::run_repl_on_stdin;
 use qorb::resolver::Resolver;
 use qorb::resolvers::fixed::FixedResolver;
+use sled_agent_types::sled::BaseboardId;
 use slog::{info, o, warn};
 use std::collections::BTreeMap;
 use std::net::SocketAddr;

nexus/db-model/Cargo.toml

@@ -42,6 +42,7 @@ slog-error-chain.workspace = true
 steno.workspace = true
 strum.workspace = true
 thiserror.workspace = true
+trust-quorum-protocol.workspace = true
 tokio.workspace = true
 uuid.workspace = true
 

nexus/db-model/src/deployment.rs

@@ -57,7 +57,6 @@ use nexus_types::deployment::{
     OmicronZoneExternalFloatingAddr, OmicronZoneExternalFloatingIp,
     OmicronZoneExternalSnatIp,
 };
-use nexus_types::inventory::BaseboardId;
 use omicron_common::address::Ipv6Subnet;
 use omicron_common::address::SLED_PREFIX;
 use omicron_common::api::internal::shared::NetworkInterface;
@@ -69,6 +68,7 @@ use omicron_uuid_kinds::{
     PhysicalDiskKind, SledKind, SledUuid, ZpoolKind, ZpoolUuid,
 };
 use sled_agent_types::inventory::OmicronZoneDataset;
+use sled_agent_types::sled::BaseboardId;
 use std::net::{IpAddr, SocketAddrV6};
 use std::sync::Arc;
 use uuid::Uuid;

nexus/db-model/src/inventory.rs

@@ -47,9 +47,8 @@ use nexus_db_schema::schema::{
 };
 use nexus_types::inventory::HostPhase1ActiveSlot;
 use nexus_types::inventory::{
-    BaseboardId, Caboose, CockroachStatus, Collection,
-    InternalDnsGenerationStatus, NvmeFirmware, PowerState, RotPage, RotSlot,
-    TimeSync,
+    Caboose, CockroachStatus, Collection, InternalDnsGenerationStatus,
+    NvmeFirmware, PowerState, RotPage, RotSlot, TimeSync,
 };
 use omicron_common::api::external;
 use omicron_common::api::internal::shared::NetworkInterface;
@@ -94,6 +93,7 @@ use sled_agent_types::inventory::{
     ConfigReconcilerInventoryResult, OmicronSledConfig, OmicronZoneConfig,
     OmicronZoneDataset, OmicronZoneImageSource, OmicronZoneType,
 };
+use sled_agent_types::sled::BaseboardId;
 use std::collections::BTreeSet;
 use std::net::{IpAddr, SocketAddrV6};
 use std::time::Duration;
@@ -489,8 +489,8 @@ impl<'a> From<&'a Collection> for InvCollection {
     }
 }
 
-/// See [`nexus_types::inventory::BaseboardId`].
-#[derive(Queryable, Insertable, Clone, Debug, Selectable)]
+/// See [`sled_agent_types::sled::BaseboardId`].
+#[derive(Queryable, Insertable, Clone, Debug, Selectable, PartialEq, Eq)]
 #[diesel(table_name = hw_baseboard_id)]
 pub struct HwBaseboardId {
     pub id: Uuid,

nexus/db-model/src/lib.rs

@@ -87,6 +87,7 @@ mod silo_auth_settings;
 mod switch_interface;
 mod switch_port;
 mod target_release;
+mod trust_quorum;
 mod v2p_mapping;
 mod vmm_state;
 mod webhook_delivery;
@@ -262,6 +263,7 @@ pub use switch::*;
 pub use switch_interface::*;
 pub use switch_port::*;
 pub use target_release::*;
+pub use trust_quorum::*;
 pub use tuf_repo::*;
 pub use typed_uuid::DbTypedUuid;
 pub use typed_uuid::to_db_typed_uuid;

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: Version = Version::new(215, 0, 0);
+pub const SCHEMA_VERSION: Version = Version::new(216, 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(216, "add-trust-quorum"),
         KnownVersion::new(215, "support-up-to-12-disks"),
         KnownVersion::new(214, "separate-transit-ips-by-version"),
         KnownVersion::new(213, "fm-cases"),

nexus/db-model/src/trust_quorum.rs

@@ -0,0 +1,115 @@
+// 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/.
+
+//! Database representations for trust quorum types
+
+use super::impl_enum_type;
+use crate::SqlU8;
+use crate::typed_uuid::DbTypedUuid;
+use nexus_db_schema::schema::{
+    trust_quorum_configuration, trust_quorum_member,
+};
+use nexus_types::trust_quorum::{
+    TrustQuorumConfigState, TrustQuorumMemberState,
+};
+use omicron_uuid_kinds::RackKind;
+use serde::{Deserialize, Serialize};
+use uuid::Uuid;
+
+impl_enum_type!(
+    TrustQuorumConfigurationStateEnum:
+
+    #[derive(Clone, Copy, Debug, AsExpression, FromSqlRow, Serialize, Deserialize, PartialEq)]
+    pub enum DbTrustQuorumConfigurationState;
+
+    // Enum values
+    Preparing => b"preparing"
+    PreparingLrtqUpgrade => b"preparing-lrtq-upgrade"
+    Committing => b"committing"
+    Committed => b"committed"
+    Aborted => b"aborted"
+);
+
+impl From<DbTrustQuorumConfigurationState> for TrustQuorumConfigState {
+    fn from(value: DbTrustQuorumConfigurationState) -> Self {
+        match value {
+            DbTrustQuorumConfigurationState::Preparing => Self::Preparing,
+            DbTrustQuorumConfigurationState::PreparingLrtqUpgrade => {
+                Self::PreparingLrtqUpgrade
+            }
+            DbTrustQuorumConfigurationState::Committing => Self::Committing,
+            DbTrustQuorumConfigurationState::Committed => Self::Committed,
+            DbTrustQuorumConfigurationState::Aborted => Self::Aborted,
+        }
+    }
+}
+
+impl From<TrustQuorumConfigState> for DbTrustQuorumConfigurationState {
+    fn from(value: TrustQuorumConfigState) -> Self {
+        match value {
+            TrustQuorumConfigState::Preparing => Self::Preparing,
+            TrustQuorumConfigState::PreparingLrtqUpgrade => {
+                Self::PreparingLrtqUpgrade
+            }
+            TrustQuorumConfigState::Committing => Self::Committing,
+            TrustQuorumConfigState::Committed => Self::Committed,
+            TrustQuorumConfigState::Aborted => Self::Aborted,
+        }
+    }
+}
+
+impl_enum_type!(
+    TrustQuorumMemberStateEnum:
+
+    #[derive(Clone, Copy, Debug, AsExpression, FromSqlRow, Serialize, Deserialize, PartialEq)]
+    pub enum DbTrustQuorumMemberState;
+
+    // Enum values
+    Unacked => b"unacked"
+    Prepared => b"prepared"
+    Committed => b"committed"
+);
+
+impl From<DbTrustQuorumMemberState> for TrustQuorumMemberState {
+    fn from(value: DbTrustQuorumMemberState) -> Self {
+        match value {
+            DbTrustQuorumMemberState::Unacked => Self::Unacked,
+            DbTrustQuorumMemberState::Prepared => Self::Prepared,
+            DbTrustQuorumMemberState::Committed => Self::Committed,
+        }
+    }
+}
+
+impl From<TrustQuorumMemberState> for DbTrustQuorumMemberState {
+    fn from(value: TrustQuorumMemberState) -> Self {
+        match value {
+            TrustQuorumMemberState::Unacked => Self::Unacked,
+            TrustQuorumMemberState::Prepared => Self::Prepared,
+            TrustQuorumMemberState::Committed => Self::Committed,
+        }
+    }
+}
+
+#[derive(Queryable, Insertable, Clone, Debug, Selectable)]
+#[diesel(table_name = trust_quorum_configuration)]
+pub struct TrustQuorumConfiguration {
+    pub rack_id: DbTypedUuid<RackKind>,
+    pub epoch: i64,
+    pub state: DbTrustQuorumConfigurationState,
+    pub threshold: SqlU8,
+    pub commit_crash_tolerance: SqlU8,
+    pub coordinator: Uuid,
+    pub encrypted_rack_secrets_salt: Option<String>,
+    pub encrypted_rack_secrets: Option<Vec<u8>>,
+}
+
+#[derive(Queryable, Insertable, Clone, Debug, Selectable)]
+#[diesel(table_name = trust_quorum_member)]
+pub struct TrustQuorumMember {
+    pub rack_id: DbTypedUuid<RackKind>,
+    pub epoch: i64,
+    pub hw_baseboard_id: Uuid,
+    pub state: DbTrustQuorumMemberState,
+    pub share_digest: Option<String>,
+}

nexus/db-queries/Cargo.toml

@@ -56,6 +56,7 @@ swrite.workspace = true
 thiserror.workspace = true
 tokio = { workspace = true, features = ["full"] }
 tufaceous-artifact.workspace = true
+trust-quorum-protocol.workspace = true
 url.workspace = true
 usdt.workspace = true
 uuid.workspace = true

nexus/db-queries/src/db/datastore/deployment.rs

@@ -91,7 +91,6 @@ use nexus_types::deployment::PendingMgsUpdateRotBootloaderDetails;
 use nexus_types::deployment::PendingMgsUpdateRotDetails;
 use nexus_types::deployment::PendingMgsUpdateSpDetails;
 use nexus_types::deployment::PendingMgsUpdates;
-use nexus_types::inventory::BaseboardId;
 use omicron_common::api::external::DataPageParams;
 use omicron_common::api::external::Error;
 use omicron_common::api::external::Generation;
@@ -105,6 +104,7 @@ use omicron_uuid_kinds::GenericUuid;
 use omicron_uuid_kinds::OmicronZoneUuid;
 use omicron_uuid_kinds::SledUuid;
 use omicron_uuid_kinds::TypedUuid;
+use sled_agent_types::sled::BaseboardId;
 use slog::Logger;
 use slog_error_chain::InlineErrorChain;
 use std::collections::BTreeMap;
@@ -3097,7 +3097,6 @@ mod tests {
     use nexus_types::external_api::views::PhysicalDiskState;
     use nexus_types::external_api::views::SledPolicy;
     use nexus_types::external_api::views::SledState;
-    use nexus_types::inventory::BaseboardId;
     use nexus_types::inventory::Collection;
     use omicron_common::address::IpRange;
     use omicron_common::address::Ipv6Subnet;
@@ -3116,6 +3115,7 @@ mod tests {
     use omicron_uuid_kinds::ZpoolUuid;
     use pretty_assertions::assert_eq;
     use rand::Rng;
+    use sled_agent_types::sled::BaseboardId;
     use std::collections::BTreeSet;
     use std::mem;
     use std::net::Ipv6Addr;