pq/libfreemkv
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.13.43: Pass 1 transport-failure recovery loop

Browse Source
This commit is contained in:
matthew
2026-04-29 08:53:56 -07:00
parent 2e276abb9b
commit 6934f735d5
4 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/disc/mod.rs
+5 -21
View File
@@ -1281,7 +1281,6 @@ impl Disc {
let mut buf = vec![0u8; batch as usize * 2048];
let mut bytes_done = 0u64;
let mut halt_requested = false;
let mut consecutive_transport_failures: u32 = 0;
let copy_t0 = std::time::Instant::now();
let mut iter_count: u64 = 0;
let mut read_ok_count: u64 = 0;
@@ -1362,7 +1361,6 @@ impl Disc {
if read_result.is_ok() {
read_ok_count += 1;
consecutive_transport_failures = 0;
if opts.decrypt {
crate::decrypt::decrypt_sectors(
&mut buf[..block_bytes as usize],
@@ -1392,32 +1390,18 @@ impl Disc {
let err = read_result.err().unwrap();
read_err_count += 1;
let is_transport = err.is_scsi_transport_failure();
if is_transport {
consecutive_transport_failures += 1;
if err.is_scsi_transport_failure() {
tracing::warn!(
target: "freemkv::disc",
phase = "transport_failure",
lba = block_lba,
consecutive = consecutive_transport_failures,
"transport failure (bridge crash); skipping block"
error = %err,
"transport failure (bridge crash); aborting copy — caller should USB reset + resume"
);
if consecutive_transport_failures >= 3 {
tracing::warn!(
target: "freemkv::disc",
phase = "transport_failure_abort",
consecutive = consecutive_transport_failures,
"3 consecutive transport failures; aborting copy"
);
return Err(err);
}
} else {
consecutive_transport_failures = 0;
return Err(err);
}
if !is_transport
&& !err.is_marginal_read()
if !err.is_marginal_read()
&& err.scsi_sense().is_none_or(|s| !s.is_medium_error())
{
return Err(err);