[nexus][support-bundles] Avoid looking at expunged datasets, zones

nexus/db-model/src/schema_versions.rs

@@ -17,7 +17,7 @@ use std::collections::BTreeMap;
 ///
 /// 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(118, 0, 0);
+pub const SCHEMA_VERSION: SemverVersion = SemverVersion::new(119, 0, 0);
 
 /// List of all past database schema versions, in *reverse* order
 ///
@@ -29,6 +29,7 @@ static KNOWN_VERSIONS: Lazy<Vec<KnownVersion>> = Lazy::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(119, "support-bundle-dataset-index"),
         KnownVersion::new(118, "support-bundles"),
         KnownVersion::new(117, "add-completing-and-new-region-volume"),
         KnownVersion::new(116, "bp-physical-disk-disposition"),

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

@@ -225,22 +225,7 @@ impl DataStore {
     ) -> Result<SupportBundleExpungementReport, Error> {
         opctx.authorize(authz::Action::Modify, &authz::FLEET).await?;
 
-        // For this blueprint: The set of all expunged Nexus zones
-        let invalid_nexus_zones = blueprint
-            .all_omicron_zones(
-                nexus_types::deployment::BlueprintZoneFilter::Expunged,
-            )
-            .filter_map(|(_sled, zone)| {
-                if matches!(
-                    zone.zone_type,
-                    nexus_types::deployment::BlueprintZoneType::Nexus(_)
-                ) {
-                    Some(zone.id.into_untyped_uuid())
-                } else {
-                    None
-                }
-            })
-            .collect::<Vec<Uuid>>();
+        // For this blueprint: The set of all in-service Nexus zones.
         let valid_nexus_zones = blueprint
             .all_omicron_zones(
                 nexus_types::deployment::BlueprintZoneFilter::ShouldBeRunning,
@@ -257,10 +242,10 @@ impl DataStore {
             })
             .collect::<Vec<Uuid>>();
 
-        // For this blueprint: The set of expunged debug datasets
-        let invalid_datasets = blueprint
+        // For this blueprint: The set of in-service debug datasets
+        let valid_datasets = blueprint
             .all_omicron_datasets(
-                nexus_types::deployment::BlueprintDatasetFilter::Expunged,
+                nexus_types::deployment::BlueprintDatasetFilter::InService,
             )
             .filter_map(|(_sled_id, dataset_config)| {
                 if matches!(
@@ -282,15 +267,14 @@ impl DataStore {
             opctx,
             BlueprintUuid::from_untyped_uuid(blueprint.id),
             |conn| {
-                let invalid_nexus_zones = invalid_nexus_zones.clone();
                 let valid_nexus_zones = valid_nexus_zones.clone();
-                let invalid_datasets = invalid_datasets.clone();
+                let valid_datasets = valid_datasets.clone();
                 async move {
                     use db::schema::support_bundle::dsl;
 
                     // Find all bundles without backing storage.
                     let bundles_with_bad_datasets = dsl::support_bundle
-                        .filter(dsl::dataset_id.eq_any(invalid_datasets))
+                        .filter(dsl::dataset_id.ne_all(valid_datasets))
                         .select(SupportBundle::as_select())
                         .load_async(conn)
                         .await?;
@@ -347,7 +331,7 @@ impl DataStore {
 
                     // Find all bundles on nexuses that no longer exist.
                     let bundles_with_bad_nexuses = dsl::support_bundle
-                        .filter(dsl::assigned_nexus.eq_any(invalid_nexus_zones))
+                        .filter(dsl::assigned_nexus.ne_all(valid_nexus_zones))
                         .select(SupportBundle::as_select())
                         .load_async(conn)
                         .await?;

schema/crdb/dbinit.sql

@@ -2447,7 +2447,7 @@ CREATE TABLE IF NOT EXISTS omicron.public.support_bundle (
 -- for allocation changes to allocate more intelligently.
 CREATE UNIQUE INDEX IF NOT EXISTS one_bundle_per_dataset ON omicron.public.support_bundle (
     dataset_id
-);
+) WHERE dataset_id IS NOT NULL;
 
 CREATE INDEX IF NOT EXISTS lookup_bundle_by_nexus ON omicron.public.support_bundle (
     assigned_nexus
@@ -4757,7 +4757,7 @@ INSERT INTO omicron.public.db_metadata (
     version,
     target_version
 ) VALUES
-    (TRUE, NOW(), NOW(), '118.0.0', NULL)
+    (TRUE, NOW(), NOW(), '119.0.0', NULL)
 ON CONFLICT DO NOTHING;
 
 COMMIT;

schema/crdb/support-bundle-dataset-index/up01.sql

@@ -0,0 +1,2 @@
+-- Drop the old unique index
+DROP INDEX IF EXISTS one_bundle_per_index CASCADE;

schema/crdb/support-bundle-dataset-index/up02.sql

@@ -0,0 +1,4 @@
+-- Create a new unique index
+CREATE UNIQUE INDEX IF NOT EXISTS one_bundle_per_dataset ON omicron.public.support_bundle (
+    dataset_id
+) WHERE dataset_id IS NOT NULL;