tyler
/
proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

backup verify: unify check if chunk can be skipped 

This also re-checks the corrupt chunk list before actually loading a
chunk.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2021-04-15 12:36:50 +02:00
parent 0216f56241
commit 7b2d3a5fe9
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/backup/verify.rs
View File

@ -166,6 +166,19 @@ fn verify_index_chunks(
} }
); );
let skip_chunk = |digest: &[u8; 32]| -> bool {
if verify_worker.verified_chunks.lock().unwrap().contains(digest) {
true
} else if verify_worker.corrupt_chunks.lock().unwrap().contains(digest) {
let digest_str = proxmox::tools::digest_to_hex(digest);
task_log!(verify_worker.worker, "chunk {} was marked as corrupt", digest_str);
errors.fetch_add(1, Ordering::SeqCst);
true
} else {
false
}
};
let index_count = index.index_count(); let index_count = index.index_count();
let mut chunk_list = Vec::with_capacity(index_count); let mut chunk_list = Vec::with_capacity(index_count);
@ -177,15 +190,8 @@ fn verify_index_chunks(
let info = index.chunk_info(pos).unwrap(); let info = index.chunk_info(pos).unwrap();
if verify_worker.verified_chunks.lock().unwrap().contains(&info.digest) { if skip_chunk(&info.digest) {
continue; // already verified continue; // already verified or marked corrupt
}
if verify_worker.corrupt_chunks.lock().unwrap().contains(&info.digest) {
let digest_str = proxmox::tools::digest_to_hex(&info.digest);
task_log!(verify_worker.worker, "chunk {} was marked as corrupt", digest_str);
errors.fetch_add(1, Ordering::SeqCst);
continue;
} }
match verify_worker.datastore.stat_chunk(&info.digest) { match verify_worker.datastore.stat_chunk(&info.digest) {
@ -215,9 +221,8 @@ fn verify_index_chunks(
let info = index.chunk_info(pos).unwrap(); let info = index.chunk_info(pos).unwrap();
// we must always recheck this here, the parallel worker below alter it! // we must always recheck this here, the parallel worker below alter it!
// Else we miss skipping repeated chunks from the same index, and re-verify them all if skip_chunk(&info.digest) {
if verify_worker.verified_chunks.lock().unwrap().contains(&info.digest) { continue; // already verified or marked corrupt
continue; // already verified
} }
match verify_worker.datastore.load_chunk(&info.digest) { match verify_worker.datastore.load_chunk(&info.digest) {