From add2874593245f89aa62700e80075582343b476d Mon Sep 17 00:00:00 2001 From: "Andrew J. Stone" Date: Wed, 16 Oct 2024 21:56:59 +0000 Subject: [PATCH] Add clickhouse_policy to PlanningInputFromDb --- nexus/reconfigurator/execution/src/dns.rs | 1 + nexus/reconfigurator/preparation/src/lib.rs | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/nexus/reconfigurator/execution/src/dns.rs b/nexus/reconfigurator/execution/src/dns.rs index d6f4cdb5de..c32677fe4b 100644 --- a/nexus/reconfigurator/execution/src/dns.rs +++ b/nexus/reconfigurator/execution/src/dns.rs @@ -1377,6 +1377,7 @@ mod test { target_cockroachdb_cluster_version: CockroachDbClusterVersion::POLICY, target_crucible_pantry_zone_count: CRUCIBLE_PANTRY_REDUNDANCY, + clickhouse_policy: None, log, } .build() diff --git a/nexus/reconfigurator/preparation/src/lib.rs b/nexus/reconfigurator/preparation/src/lib.rs index 9e14289e8a..24f32e9187 100644 --- a/nexus/reconfigurator/preparation/src/lib.rs +++ b/nexus/reconfigurator/preparation/src/lib.rs @@ -16,6 +16,7 @@ use nexus_db_queries::db::pagination::Paginator; use nexus_db_queries::db::DataStore; use nexus_types::deployment::Blueprint; use nexus_types::deployment::BlueprintMetadata; +use nexus_types::deployment::ClickhousePolicy; use nexus_types::deployment::CockroachDbClusterVersion; use nexus_types::deployment::CockroachDbSettings; use nexus_types::deployment::OmicronZoneExternalIp; @@ -75,6 +76,7 @@ pub struct PlanningInputFromDb<'a> { pub internal_dns_version: nexus_db_model::Generation, pub external_dns_version: nexus_db_model::Generation, pub cockroachdb_settings: &'a CockroachDbSettings, + pub clickhouse_policy: Option, pub log: &'a Logger, } @@ -138,6 +140,11 @@ impl PlanningInputFromDb<'_> { .await .internal_context("fetching cockroachdb settings")?; + let clickhouse_policy = datastore + .clickhouse_policy_get_latest(opctx) + .await + .internal_context("fetching clickhouse policy")?; + let planning_input = PlanningInputFromDb { sled_rows: &sled_rows, zpool_rows: &zpool_rows, @@ -156,6 +163,7 @@ impl PlanningInputFromDb<'_> { internal_dns_version, external_dns_version, cockroachdb_settings: &cockroachdb_settings, + clickhouse_policy, } .build() .internal_context("assembling planning_input")?; @@ -177,7 +185,7 @@ impl PlanningInputFromDb<'_> { .target_cockroachdb_cluster_version, target_crucible_pantry_zone_count: self .target_crucible_pantry_zone_count, - clickhouse_policy: None, + clickhouse_policy: self.clickhouse_policy.clone(), }; let mut builder = PlanningInputBuilder::new( policy,