Check hashes during repair

Author: mkeeter

downstairs/src/extent.rs

@@ -251,7 +251,22 @@ pub fn extent_dir<P: AsRef<Path>>(dir: P, number: ExtentId) -> PathBuf {
  * anchored under "dir".
  */
 pub fn extent_path<P: AsRef<Path>>(dir: P, number: ExtentId) -> PathBuf {
-    extent_dir(dir, number).join(extent_file_name(number, ExtentType::Data))
+    let e = extent_file_name(number, ExtentType::Data);
+
+    // XXX terrible hack: if someone has already provided a full directory tree
+    // ending in `.copy`, then just append the extent file name.  This lets us
+    // open individual extent files during live-repair.
+    if dir
+        .as_ref()
+        .iter()
+        .next_back()
+        .and_then(|s| s.to_str())
+        .is_some_and(|s| s.ends_with(".copy"))
+    {
+        dir.as_ref().join(e)
+    } else {
+        extent_dir(dir, number).join(e)
+    }
 }
 
 /**

downstairs/src/region.rs

@@ -682,6 +682,28 @@ impl Region {
             );
         }
 
+        // Validate the extent that we just received, before copying it over
+        {
+            let new_extent = match Extent::open(
+                &copy_dir,
+                &self.def(),
+                eid,
+                true, // read-only
+                &self.log.clone(),
+            ) {
+                Ok(e) => e,
+                Err(e) => {
+                    panic!(
+                        "Failed to open live-repair extent {eid} in \
+                         {copy_dir:?}: {e:?}"
+                    );
+                }
+            };
+            if let Err(e) = new_extent.validate() {
+                panic!("Failed to validate live-repair extent {eid}: {e:?}");
+            }
+        }
+
         // After we have all files: move the repair dir.
         info!(
             self.log,