Deuxfleurs/garage
46
56
Fork 73
Code Issues 100 Pull requests 14 Releases 30 Wiki Activity

fix blocksync not resyncing compressed blocs properly #89

Merged
lx merged 1 commit from trinity-1686a/garage:fix-blocksync-storage-opti into storage-optimizations 2021-06-01 21:54:45 +00:00
Conversation 0 Commits 1 Files changed 1 +9 -1
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit e44bec738c - Show all commits

10
src/model/block.rs
View file

@ -599,11 +599,19 @@ impl BlockManager {
Err(_) => continue, Err(_) => continue,
}; };
let ent_type = data_dir_ent.file_type().await?; let ent_type = data_dir_ent.file_type().await?;
let mut iter_name = name.split('.');
let name = iter_name
.next()
.expect("split always contain at least one item");
let corrupted = iter_name
.last()
.map(|ext| ext == "corrupted")
.unwrap_or(false);
if name.len() == 2 && hex::decode(&name).is_ok() && ent_type.is_dir() { if name.len() == 2 && hex::decode(&name).is_ok() && ent_type.is_dir() {
self.repair_aux_read_dir_rec(&data_dir_ent.path(), must_exit) self.repair_aux_read_dir_rec(&data_dir_ent.path(), must_exit)
.await?; .await?;
} else if name.len() == 64 { } else if name.len() == 64 && !corrupted {
let hash_bytes = match hex::decode(&name) { let hash_bytes = match hex::decode(&name) {
Ok(h) => h, Ok(h) => h,
Err(_) => continue, Err(_) => continue,