Merge pull request #2628 from subspace/recoverable-piece-scrub

Make piece reading during `scrub` recoverable
autonomys · Mar 19, 2024 · 284b10c · 284b10c
2 parents b8e8fc4 + bd1229d
commit 284b10c
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/crates/subspace-farmer/src/single_disk_farm.rs b/crates/subspace-farmer/src/single_disk_farm.rs
@@ -1931,12 +1931,8 @@ impl SingleDiskFarm {
                                 %offset,
                                 "Failed to read piece bytes"
                             );
-                            return Err(SingleDiskFarmScrubError::FailedToReadBytes {
-                                file: plot_file_path.clone(),
-                                size: piece.len() as u64,
-                                offset,
-                                error,
-                            });
+
+                            continue;
                         }
 
                         hasher.update(piece.as_ref());
@@ -1949,12 +1945,13 @@ impl SingleDiskFarm {
                             + u64::from(pieces_in_sector) * Piece::SIZE as u64;
                         if let Err(error) = plot_file.read_exact_at(&mut expected_checksum, offset)
                         {
-                            return Err(SingleDiskFarmScrubError::FailedToReadBytes {
-                                file: plot_file_path.clone(),
-                                size: expected_checksum.len() as u64,
-                                offset,
-                                error,
-                            });
+                            warn!(
+                                path = %plot_file_path.display(),
+                                %error,
+                                %sector_index,
+                                %offset,
+                                "Failed to read checksum bytes"
+                            );
                         }
                     }