dump verify, now with par_iter

Author: Alan Hanson

downstairs/src/dump.rs

@@ -1,6 +1,7 @@
 // Copyright 2021 Oxide Computer Company
 use super::*;
 use crate::extent::ExtentMeta;
+use rayon::prelude::*;
 use std::convert::TryInto;
 
 use sha2::{Digest, Sha256};
@@ -10,29 +11,29 @@ struct ExtInfo {
     ei_hm: HashMap<u32, ExtentMeta>,
 }
 
-pub fn verify_region(
-    region_dir: PathBuf,
-    log: Logger,
-) -> Result<()> {
-
-    let mut verify_error = false;
+pub fn verify_region(region_dir: PathBuf, log: Logger) -> Result<()> {
     let region = Region::open(region_dir, false, true, &log)?;
+    let errors: Vec<_> = region
+        .extents
+        .par_iter()
+        .filter_map(|e| {
+            let extent = match e {
+                extent::ExtentState::Opened(extent) => extent,
+                extent::ExtentState::Closed => panic!("dump on closed extent!"),
+            };
 
-    for e in &region.extents {
-        let e = match e {
-            extent::ExtentState::Opened(extent) => extent,
-            extent::ExtentState::Closed => panic!("dump on closed extent!"),
-        };
+            if let Err(err) = extent.validate() {
+                Some((extent.number, err))
+            } else {
+                None
+            }
+        })
+        .collect();
 
-        if let Err(err) = e.validate() {
-            println!(
-                "validation failed for extent {}: {:?}",
-                e.number, err
-            );
-            verify_error = true;
+    if !errors.is_empty() {
+        for (number, err) in &errors {
+            println!("validation failed for extent {}: {:?}", number, err);
         }
-    }
-    if verify_error {
         bail!("Region failed to verify");
     }
     Ok(())

downstairs/src/lib.rs

@@ -52,7 +52,7 @@ use extent::ExtentState;
 use region::Region;
 
 pub use admin::run_dropshot;
-pub use dump::{verify_region, dump_region};
+pub use dump::{dump_region, verify_region};
 pub use dynamometer::*;
 pub use stats::{DsCountStat, DsStatOuter};
 

downstairs/src/main.rs

@@ -477,11 +477,7 @@ async fn main() -> Result<()> {
 
             run_dropshot(bind_addr, &log).await
         }
-        Args::Verify {
-            data,
-        } => {
-            verify_region(data, log)
-        }
+        Args::Verify { data } => verify_region(data, log),
         Args::Version => {
             let info = crucible_common::BuildInfo::default();
             println!("Crucible Version: {}", info);