diff --git a/Jenkinsfile b/Jenkinsfile index 744873217..983d94d8f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -140,6 +140,7 @@ pipeline { anyOf { branch 'master' branch 'release/*' + branch 'trying' expression { run_linter == false } } } diff --git a/io-engine/src/rebuild/rebuild_task.rs b/io-engine/src/rebuild/rebuild_task.rs index c01b82e3d..3c5b9ac5e 100644 --- a/io-engine/src/rebuild/rebuild_task.rs +++ b/io-engine/src/rebuild/rebuild_task.rs @@ -220,17 +220,26 @@ impl RebuildTask { return Ok(()); } + let msg = format!( + "Rebuild job '{src}' -> '{dst}': verification failed", + src = desc.src_uri, + dst = desc.dst_uri + ); + match desc.options.verify_mode { - RebuildVerifyMode::None => Ok(()), - RebuildVerifyMode::Fail => Err(RebuildError::VerifyCompareFailed { - bdev: desc.dst_uri.clone(), - }), + RebuildVerifyMode::None => { + error!("{msg}: ignoring"); + Ok(()) + } + RebuildVerifyMode::Fail => { + error!("{msg}: failing rebuild"); + Err(RebuildError::VerifyCompareFailed { + bdev: desc.dst_uri.clone(), + }) + } RebuildVerifyMode::Panic => { - panic!( - "Rebuild job '{src}' -> '{dst}': verification failed", - src = desc.src_uri, - dst = desc.dst_uri - ); + error!("{msg}: will panic"); + panic!("{}", msg); } } }