Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: stratis-storage/stratisd
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5a5b21d8103e4338278dfa5867b608a645f7f4a7
Choose a base ref
..
head repository: stratis-storage/stratisd
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6806499eabde24fbe787f6dbb59d7993991825cb
Choose a head ref
Showing with 9 additions and 0 deletions.
  1. +9 −0 src/engine/strat_engine/thinpool/thinpool.rs
9 changes: 9 additions & 0 deletions src/engine/strat_engine/thinpool/thinpool.rs
Original file line number Diff line number Diff line change
@@ -3049,6 +3049,15 @@ mod tests {
pool.set_fs_merge_scheduled(sn2_uuid, true).unwrap();
assert!(pool.set_fs_merge_scheduled(sn1_uuid, true).is_err());
pool.set_fs_merge_scheduled(sn1_uuid, false).unwrap();

assert!(pool
.destroy_filesystems(pool_name, &[sn2_uuid, sn1_uuid].into())
.is_err());
assert!(pool
.destroy_filesystems(pool_name, &[fs_uuid, sn1_uuid].into())
.is_err());
pool.set_fs_merge_scheduled(sn2_uuid, false).unwrap();

retry_operation!(pool.destroy_filesystems(pool_name, &[fs_uuid, sn2_uuid].into()));

assert_eq!(