Retain origin when reverting a snap into another

Signed-off-by: mulhern <[email protected]>
stratis-storage · Sep 9, 2024 · 14f4c52 · 14f4c52
1 parent 2244245
commit 14f4c52
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/engine/strat_engine/thinpool/thinpool.rs b/src/engine/strat_engine/thinpool/thinpool.rs
@@ -1330,10 +1330,11 @@ where
             snap.uuid = origin.uuid;
 
             let snap_origin = snap.origin;
-            snap.origin = None;
+            snap.origin = origin.origin;
 
+            assert!(!origin.merge.unwrap_or(false));
             let snap_merge = snap.merge;
-            snap.merge = Some(false);
+            snap.merge = origin.merge;
 
             let snap_name = snap.name;
             snap.name = origin.name.to_owned();