Use the fallback method for finding Stratis block devices

Do not expect udev to catch up in time.

Signed-off-by: mulhern <[email protected]>

src/engine/strat_engine/backstore/backstore.rs

@@ -601,7 +601,9 @@ mod tests {
     use devicemapper::{CacheDevStatus, DataBlocks, IEC};
 
     use crate::engine::strat_engine::{
-        backstore::{identify::find_all, metadata::device_identifiers},
+        backstore::{
+            identify::find_all_block_devices_with_stratis_signatures, metadata::device_identifiers,
+        },
         cmd,
         tests::{loopbacked, real},
     };
@@ -803,6 +805,10 @@ mod tests {
     /// Setup the same backstore again.
     /// Verify blockdev metadata again.
     /// Destroy all.
+    // This method uses the fallback method for finding all Stratis devices,
+    // since udev sometimes can not catch up to the changes made in this test
+    // in the time the test allows. The fallback method has the long name
+    // "find_all_block_devices_with_stratis_signatures".
     fn test_setup(paths: &[&Path]) {
         assert!(paths.len() > 1);
 
@@ -852,7 +858,7 @@ mod tests {
 
         cmd::udev_settle().unwrap();
 
-        let map = find_all().unwrap();
+        let map = find_all_block_devices_with_stratis_signatures().unwrap();
         assert_eq!(
             map.keys().collect::<HashSet<&PoolUuid>>(),
             vec![pool_uuid].iter().collect::<HashSet<&PoolUuid>>()
@@ -870,7 +876,7 @@ mod tests {
 
         cmd::udev_settle().unwrap();
 
-        let map = find_all().unwrap();
+        let map = find_all_block_devices_with_stratis_signatures().unwrap();
         assert_eq!(
             map.keys().collect::<HashSet<&PoolUuid>>(),
             vec![pool_uuid].iter().collect::<HashSet<&PoolUuid>>()

src/engine/strat_engine/backstore/devices.rs

@@ -291,7 +291,10 @@ mod tests {
     use uuid::Uuid;
 
     use crate::engine::strat_engine::{
-        backstore::{identify::find_all, metadata::device_identifiers, setup::get_metadata},
+        backstore::{
+            identify::find_all_block_devices_with_stratis_signatures, metadata::device_identifiers,
+            setup::get_metadata,
+        },
         cmd,
         tests::{loopbacked, real},
     };
@@ -441,6 +444,10 @@ mod tests {
     /// 5. Run find_all() again and verify that both sets of devices are found.
     /// 6. Verify that get_metadata() return an error. initialize() only
     /// initializes block devices, it does not write metadata.
+    // This method uses the fallback method for finding all Stratis devices,
+    // since udev sometimes can not catch up to the changes made in this test
+    // in the time the test allows. The fallback method has the long name
+    // "find_all_block_devices_with_stratis_signatures".
     fn test_initialize(paths: &[&Path]) {
         assert!(paths.len() > 1);
 
@@ -468,7 +475,7 @@ mod tests {
         cmd::udev_settle().unwrap();
 
         {
-            let pools = find_all().unwrap();
+            let pools = find_all_block_devices_with_stratis_signatures().unwrap();
 
             assert_eq!(pools.len(), 1);
             assert!(pools.contains_key(&uuid1));
@@ -501,7 +508,7 @@ mod tests {
         cmd::udev_settle().unwrap();
 
         {
-            let pools = find_all().unwrap();
+            let pools = find_all_block_devices_with_stratis_signatures().unwrap();
 
             assert_eq!(pools.len(), 2);
             assert!(pools.contains_key(&uuid1));

src/engine/strat_engine/backstore/identify.rs

@@ -135,7 +135,7 @@ fn process_unowned_device(dev: &libudev::Device) -> Option<(PoolUuid, DevUuid, D
 
 // Use udev to identify all block devices and return the subset of those
 // that have Stratis signatures.
-fn find_all_block_devices_with_stratis_signatures(
+pub fn find_all_block_devices_with_stratis_signatures(
 ) -> libudev::Result<HashMap<PoolUuid, HashMap<Device, PathBuf>>> {
     let context = libudev::Context::new()?;
     let mut enumerator = block_enumerator(&context)?;