Fewer unwraps

oxidecomputer · Oct 9, 2023 · beef95c · beef95c
1 parent f9c7826
commit beef95c
Showing 1 changed file with 49 additions and 10 deletions.
diff --git a/agent/src/main.rs b/agent/src/main.rs
@@ -1573,7 +1573,8 @@ fn worker(
                             quota,
                         );
 
-                        // if regions need to be created, do that before apply_smf.
+                        // If regions need to be created, do that before
+                        // apply_smf.
                         let region_dataset = match regions_dataset
                             .ensure_child_dataset(
                                 &r.id.0,
@@ -1594,6 +1595,20 @@ fn worker(
                             }
                         };
 
+                        let dataset_path = match region_dataset.path() {
+                            Ok(dataset_path) => dataset_path,
+                            Err(e) => {
+                                error!(
+                                    log,
+                                    "Failed to find path for dataset {}: {}",
+                                    &r.id.0,
+                                    e,
+                                );
+                                df.fail(&r.id);
+                                break 'requested;
+                            }
+                        };
+
                         // It's important that a region transition to "Created"
                         // only after it has been created as a dataset:
                         // after the crucible agent restarts, `apply_smf` will
@@ -1607,7 +1622,7 @@ fn worker(
                             &log,
                             &downstairs_program,
                             &r,
-                            &region_dataset.path().unwrap(),
+                            &dataset_path,
                         )
                         .and_then(|_| df.created(&r.id));
 
@@ -1623,7 +1638,7 @@ fn worker(
                         let result = apply_smf(
                             &log,
                             &df,
-                            regions_dataset.path().unwrap(),
+                            dataset_path,
                             &downstairs_prefix,
                             &snapshot_prefix,
                         );
@@ -1635,12 +1650,25 @@ fn worker(
                         }
                     }
 
-                    State::Tombstoned => {
+                    State::Tombstoned => 'tombstoned: {
+                        let dataset_path = match regions_dataset.path() {
+                            Ok(dataset_path) => dataset_path,
+                            Err(e) => {
+                                error!(
+                                   log,
+                                   "Cannot get path on tombstoned dataset {}: {}",
+                                   &r.id.0,
+                                   e,
+                                );
+                                df.fail(&r.id);
+                                break 'tombstoned;
+                            }
+                        };
                         info!(log, "applying SMF actions before removal...");
                         let result = apply_smf(
                             &log,
                             &df,
-                            regions_dataset.path().unwrap(),
+                            dataset_path,
                             &downstairs_prefix,
                             &snapshot_prefix,
                         );
@@ -1651,11 +1679,22 @@ fn worker(
                             info!(log, "SMF ok!");
                         }
 
-                        // After SMF successfully shuts off downstairs, remove zfs
-                        // dataset.
-                        let region_dataset = regions_dataset
-                            .from_child_dataset(&r.id.0)
-                            .unwrap();
+                        // After SMF successfully shuts off downstairs, remove
+                        // zfs dataset.
+                        let region_dataset =
+                            match regions_dataset.from_child_dataset(&r.id.0) {
+                                Ok(region_dataset) => region_dataset,
+                                Err(e) => {
+                                    error!(
+                                        log,
+                                        "Cannot find region {:?} to remove: {}",
+                                        r.id.0,
+                                        e,
+                                    );
+                                    df.fail(&r.id);
+                                    break 'tombstoned;
+                                }
+                            };
 
                         let res =
                             worker_region_destroy(&log, &r, region_dataset)