Make snapshot destination_volume_id not an Option (#2092)

Co-authored-by: Alan Hanson <[email protected]>

Author: leftwo

common/src/sql/dbinit.sql

@@ -792,7 +792,7 @@ CREATE TABLE omicron.public.snapshot (
     volume_id UUID NOT NULL,
 
     /* Where will the scrubbed blocks eventually land? */
-    destination_volume_id UUID,
+    destination_volume_id UUID NOT NULL,
 
     gen INT NOT NULL,
     state omicron.public.snapshot_state NOT NULL,

nexus/db-model/src/schema.rs

@@ -77,7 +77,7 @@ table! {
         disk_id -> Uuid,
         volume_id -> Uuid,
 
-        destination_volume_id -> Nullable<Uuid>,
+        destination_volume_id -> Uuid,
 
         gen -> Int8,
         state -> crate::SnapshotStateEnum,

nexus/db-model/src/snapshot.rs

@@ -48,7 +48,7 @@ pub struct Snapshot {
     pub volume_id: Uuid,
 
     // destination of all snapshot blocks
-    pub destination_volume_id: Option<Uuid>,
+    pub destination_volume_id: Uuid,
 
     pub gen: Generation,
     pub state: SnapshotState,

nexus/src/app/disk.rs

@@ -513,9 +513,7 @@ impl super::Nexus {
 
         // Kick off volume deletion saga(s)
         self.volume_delete(db_snapshot.volume_id).await?;
-        if let Some(volume_id) = db_snapshot.destination_volume_id {
-            self.volume_delete(volume_id).await?;
-        }
+        self.volume_delete(db_snapshot.destination_volume_id).await?;
 
         Ok(())
     }

nexus/src/app/sagas/snapshot_create.rs

@@ -401,7 +401,7 @@ async fn ssc_create_snapshot_record(
         project_id: params.project_id,
         disk_id: disk.id(),
         volume_id,
-        destination_volume_id: Some(destination_volume_id),
+        destination_volume_id: destination_volume_id,
 
         gen: db::model::Generation::new(),
         state: db::model::SnapshotState::Creating,

nexus/tests/integration_tests/snapshots.rs

@@ -423,7 +423,7 @@ async fn test_reject_creating_disk_from_snapshot(
                 project_id,
                 disk_id: Uuid::new_v4(),
                 volume_id: Uuid::new_v4(),
-                destination_volume_id: None,
+                destination_volume_id: Uuid::new_v4(),
 
                 gen: db::model::Generation::new(),
                 state: db::model::SnapshotState::Creating,
@@ -580,7 +580,7 @@ async fn test_reject_creating_disk_from_illegal_snapshot(
                 project_id,
                 disk_id: Uuid::new_v4(),
                 volume_id: Uuid::new_v4(),
-                destination_volume_id: None,
+                destination_volume_id: Uuid::new_v4(),
 
                 gen: db::model::Generation::new(),
                 state: db::model::SnapshotState::Creating,
@@ -724,7 +724,7 @@ async fn test_create_snapshot_record_idempotent(
         project_id,
         disk_id: Uuid::new_v4(),
         volume_id: Uuid::new_v4(),
-        destination_volume_id: None,
+        destination_volume_id: Uuid::new_v4(),
 
         gen: db::model::Generation::new(),
         state: db::model::SnapshotState::Creating,