Deuxfleurs/garage
48
56
Fork 73
Code Issues 100 Pull requests 13 Releases 30 Wiki Activity

Background task manager #332

Merged
lx merged 35 commits from background-task-manager into main 2022-07-08 11:30:32 +00:00
Conversation 0 Commits 35 Files changed 27 +5 -13
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 4312623930 - Show all commits

18
src/block/repair.rs
View file

@ -415,11 +415,6 @@ impl BlockStoreIterator {
ReadingDir::Pending(_) => unreachable!(), ReadingDir::Pending(_) => unreachable!(),
}; };
if *pos >= subpaths.len() {
self.path.pop();
continue;
}
let data_dir_ent = match subpaths.get(*pos) { let data_dir_ent = match subpaths.get(*pos) {
None => { None => {
self.path.pop(); self.path.pop();
@ -444,14 +439,11 @@ impl BlockStoreIterator {
let path = data_dir_ent.path(); let path = data_dir_ent.path();
self.path.push(ReadingDir::Pending(path)); self.path.push(ReadingDir::Pending(path));
} else if name.len() == 64 { } else if name.len() == 64 {
let hash_bytes = if let Ok(h) = hex::decode(&name) { if let Ok(h) = hex::decode(&name) {
h let mut hash = [0u8; 32];
} else { hash.copy_from_slice(&h);
continue; return Ok(Some(hash.into()));
}; }
let mut hash = [0u8; 32];
hash.copy_from_slice(&hash_bytes[..]);
return Ok(Some(hash.into()));
} }
} }
} }