[nexus] Make it 'more default' for Debug datasets to exist in test env (#7982)

Before this PR:

- `DiskTest::new` did not create any debug datasets
- `omicron-dev run-all` did not initialize any disks
- Any tests wanting debug datasets would need to explicitly request
them, then call `disk_test.propagate_datasets_to_sleds()`.
- Additionally, in this environment, many tests assume "the only tests
which exist are crucible datasets".

After this PR:
- `DiskTest::new` does creates debug datasets on all zpools
- `omicron-dev run-all` initializes disks on the "first sled agent",
with datasets
- Any tests using `DiskTest::new` will get them by default
- Tests are adjusted to cope with multiple dataset types

Author: smklein

dev-tools/omicron-dev/src/main.rs

@@ -8,6 +8,7 @@ use futures::StreamExt;
 use libc::SIGINT;
 use nexus_config::NexusConfig;
 use nexus_test_interface::NexusServer;
+use nexus_test_utils::resource_helpers::DiskTest;
 use signal_hook_tokio::Signals;
 
 #[tokio::main]
@@ -78,6 +79,18 @@ impl RunAllArgs {
         >(&mut config, 0)
         .await
         .context("error setting up services")?;
+
+        println!("omicron-dev: Adding disks to first sled agent");
+
+        // This is how our integration tests are identifying that "disks exist"
+        // within the database.
+        //
+        // This inserts:
+        // - DEFAULT_ZPOOL_COUNT zpools, each of which contains:
+        //   - A crucible dataset
+        //   - A debug dataset
+        DiskTest::new(&cptestctx).await;
+
         println!("omicron-dev: services are running.");
 
         // Print out basic information about what was started.

nexus/src/app/background/tasks/read_only_region_replacement_start.rs

@@ -209,15 +209,14 @@ mod test {
             datastore.clone(),
         );
 
-        // Record which datasets map to which zpools for later
+        // Record which crucible datasets map to which zpools for later
 
         let mut dataset_to_zpool: BTreeMap<ZpoolUuid, DatasetUuid> =
             BTreeMap::default();
 
         for zpool in disk_test.zpools() {
-            for dataset in &zpool.datasets {
-                dataset_to_zpool.insert(zpool.id, dataset.id);
-            }
+            let dataset = zpool.crucible_dataset();
+            dataset_to_zpool.insert(zpool.id, dataset.id);
         }
 
         let mut task =

nexus/src/app/background/tasks/region_snapshot_replacement_start.rs

@@ -451,20 +451,19 @@ mod test {
             BTreeMap::default();
 
         for zpool in disk_test.zpools() {
-            for dataset in &zpool.datasets {
-                dataset_to_zpool
-                    .insert(zpool.id.to_string(), dataset.id.to_string());
-
-                datastore
-                    .region_snapshot_create(RegionSnapshot::new(
-                        dataset.id,
-                        region_id,
-                        snapshot_id,
-                        String::from("[fd00:1122:3344::101]:12345"),
-                    ))
-                    .await
-                    .unwrap();
-            }
+            let dataset = zpool.crucible_dataset();
+            dataset_to_zpool
+                .insert(zpool.id.to_string(), dataset.id.to_string());
+
+            datastore
+                .region_snapshot_create(RegionSnapshot::new(
+                    dataset.id,
+                    region_id,
+                    snapshot_id,
+                    String::from("[fd00:1122:3344::101]:12345"),
+                ))
+                .await
+                .unwrap();
         }
 
         // Create the fake snapshot
@@ -631,7 +630,8 @@ mod test {
 
         let disk_test = DiskTest::new(cptestctx).await;
 
-        let dataset_id = disk_test.zpools().next().unwrap().datasets[0].id;
+        let dataset_id =
+            disk_test.zpools().next().unwrap().crucible_dataset().id;
 
         // Add a region snapshot replacement request for a fake region snapshot
 

nexus/src/app/sagas/disk_create.rs

@@ -1010,28 +1010,23 @@ pub(crate) mod test {
         test: &DiskTest<'_>,
     ) -> bool {
         for zpool in test.zpools() {
-            for dataset in &zpool.datasets {
-                if datastore
-                    .regions_total_reserved_size(dataset.id)
-                    .await
-                    .unwrap()
-                    != 0
-                {
-                    return false;
-                }
+            let dataset = zpool.crucible_dataset();
+            if datastore.regions_total_reserved_size(dataset.id).await.unwrap()
+                != 0
+            {
+                return false;
             }
         }
         true
     }
 
     fn no_regions_ensured(sled_agent: &SledAgent, test: &DiskTest<'_>) -> bool {
         for zpool in test.zpools() {
-            for dataset in &zpool.datasets {
-                let crucible_dataset =
-                    sled_agent.get_crucible_dataset(zpool.id, dataset.id);
-                if !crucible_dataset.is_empty() {
-                    return false;
-                }
+            let dataset = zpool.crucible_dataset();
+            let crucible_dataset =
+                sled_agent.get_crucible_dataset(zpool.id, dataset.id);
+            if !crucible_dataset.is_empty() {
+                return false;
             }
         }
         true

nexus/src/app/sagas/region_replacement_start.rs

@@ -792,6 +792,8 @@ pub(crate) mod test {
         nexus_test_utils::ControlPlaneTestContext<crate::Server>;
     type DiskTest<'a> =
         nexus_test_utils::resource_helpers::DiskTest<'a, crate::Server>;
+    type DiskTestBuilder<'a> =
+        nexus_test_utils::resource_helpers::DiskTestBuilder<'a, crate::Server>;
 
     const DISK_NAME: &str = "my-disk";
     const PROJECT_NAME: &str = "springfield-squidport";
@@ -800,8 +802,8 @@ pub(crate) mod test {
     async fn test_region_replacement_start_saga(
         cptestctx: &ControlPlaneTestContext,
     ) {
-        let mut disk_test = DiskTest::new(cptestctx).await;
-        disk_test.add_zpool_with_dataset(cptestctx.first_sled_id()).await;
+        let _disk_test =
+            DiskTestBuilder::new(cptestctx).with_zpool_count(4).build().await;
 
         let client = &cptestctx.external_client;
         let nexus = &cptestctx.server.server_context().nexus;
@@ -1026,15 +1028,11 @@ pub(crate) mod test {
         let mut count = 0;
 
         for zpool in test.zpools() {
-            for dataset in &zpool.datasets {
-                if datastore
-                    .regions_total_reserved_size(dataset.id)
-                    .await
-                    .unwrap()
-                    != 0
-                {
-                    count += 1;
-                }
+            let dataset = zpool.crucible_dataset();
+            if datastore.regions_total_reserved_size(dataset.id).await.unwrap()
+                != 0
+            {
+                count += 1;
             }
         }
 
@@ -1119,8 +1117,8 @@ pub(crate) mod test {
     async fn test_action_failure_can_unwind_idempotently(
         cptestctx: &ControlPlaneTestContext,
     ) {
-        let mut disk_test = DiskTest::new(cptestctx).await;
-        disk_test.add_zpool_with_dataset(cptestctx.first_sled_id()).await;
+        let disk_test =
+            DiskTestBuilder::new(cptestctx).with_zpool_count(4).build().await;
 
         let log = &cptestctx.logctx.log;
 
@@ -1196,8 +1194,8 @@ pub(crate) mod test {
     async fn test_actions_succeed_idempotently(
         cptestctx: &ControlPlaneTestContext,
     ) {
-        let mut disk_test = DiskTest::new(cptestctx).await;
-        disk_test.add_zpool_with_dataset(cptestctx.first_sled_id()).await;
+        let _disk_test =
+            DiskTestBuilder::new(cptestctx).with_zpool_count(4).build().await;
 
         let client = &cptestctx.external_client;
         let nexus = &cptestctx.server.server_context().nexus;

nexus/src/app/sagas/region_snapshot_replacement_start.rs

@@ -1259,8 +1259,8 @@ pub(crate) mod test {
 
         assert_eq!(region_allocations(&datastore).await, 0);
 
-        let mut disk_test = DiskTest::new(cptestctx).await;
-        disk_test.add_zpool_with_dataset(cptestctx.first_sled_id()).await;
+        let disk_test =
+            DiskTestBuilder::new(cptestctx).with_zpool_count(4).build().await;
 
         assert_eq!(region_allocations(&datastore).await, 0);
 
@@ -1500,20 +1500,18 @@ pub(crate) mod test {
         let mut non_destroyed_regions_from_agent = vec![];
 
         for zpool in test.zpools() {
-            for dataset in &zpool.datasets {
-                let crucible_dataset =
-                    sled_agent.get_crucible_dataset(zpool.id, dataset.id);
-                for region in crucible_dataset.list() {
-                    match region.state {
-                        crucible_agent_client::types::State::Tombstoned
-                        | crucible_agent_client::types::State::Destroyed => {
-                            // ok
-                        }
-
-                        _ => {
-                            non_destroyed_regions_from_agent
-                                .push(region.clone());
-                        }
+            let dataset = zpool.crucible_dataset();
+            let crucible_dataset =
+                sled_agent.get_crucible_dataset(zpool.id, dataset.id);
+            for region in crucible_dataset.list() {
+                match region.state {
+                    crucible_agent_client::types::State::Tombstoned
+                    | crucible_agent_client::types::State::Destroyed => {
+                        // ok
+                    }
+
+                    _ => {
+                        non_destroyed_regions_from_agent.push(region.clone());
                     }
                 }
             }