Don't try to initialize expunged databases

oxidecomputer · Nov 15, 2024 · 83efab7 · 83efab7
1 parent c6e98a5
commit 83efab7
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/nexus/reconfigurator/execution/src/clickhouse.rs b/nexus/reconfigurator/execution/src/clickhouse.rs
@@ -20,6 +20,8 @@ use futures::future::Either;
 use futures::stream::FuturesUnordered;
 use futures::stream::StreamExt;
 use nexus_db_queries::context::OpContext;
+use nexus_sled_agent_shared::inventory::OmicronZoneType;
+use nexus_types::deployment::BlueprintZoneFilter;
 use nexus_types::deployment::BlueprintZonesConfig;
 use nexus_types::deployment::ClickhouseClusterConfig;
 use omicron_common::address::CLICKHOUSE_ADMIN_PORT;
@@ -168,7 +170,13 @@ pub(crate) async fn deploy_single_node(
     if let Some(zone) = zones
         .values()
         .flat_map(|zones| {
-            zones.zones.iter().find(|zone| zone.zone_type.is_clickhouse())
+            zones
+                .to_omicron_zones_config(BlueprintZoneFilter::ShouldBeRunning)
+                .zones
+                .into_iter()
+                .find(|zone| {
+                    matches!(zone.zone_type, OmicronZoneType::Clickhouse { .. })
+                })
         })
         .next()
     {