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

Fix block repair to not deadlock with sqlite

Browse source
This commit is contained in:
Alex 2022-06-03 12:56:35 +02:00
parent 295bc2741f
commit 9bb58638f0
Signed by: lx
GPG key ID: 0E496D15096376BE
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/block/manager.rs
View file

@ -218,9 +218,17 @@ impl BlockManager {
/// to fix any mismatch between the two. /// to fix any mismatch between the two.
pub async fn repair_data_store(&self, must_exit: &watch::Receiver<bool>) -> Result<(), Error> { pub async fn repair_data_store(&self, must_exit: &watch::Receiver<bool>) -> Result<(), Error> {
// 1. Repair blocks from RC table. // 1. Repair blocks from RC table.
// TODO don't do this like this
let mut hashes = vec![];
for (i, entry) in self.rc.rc.iter()?.enumerate() { for (i, entry) in self.rc.rc.iter()?.enumerate() {
let (hash, _) = entry?; let (hash, _) = entry?;
let hash = Hash::try_from(&hash[..]).unwrap(); let hash = Hash::try_from(&hash[..]).unwrap();
hashes.push(hash);
if i & 0xFF == 0 && *must_exit.borrow() {
return Ok(());
}
}
for (i, hash) in hashes.into_iter().enumerate() {
self.put_to_resync(&hash, Duration::from_secs(0))?; self.put_to_resync(&hash, Duration::from_secs(0))?;
if i & 0xFF == 0 && *must_exit.borrow() { if i & 0xFF == 0 && *must_exit.borrow() {
return Ok(()); return Ok(());