Deuxfleurs/garage
47
55
Fork 70
Code Issues 97 Pull requests 13 Releases 30 Wiki Activity

Add a nice warning
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse source
This commit is contained in:
Alex 2021-03-11 18:50:32 +01:00
parent db7a9d4948
commit fae5104a2c
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/table/sync.rs
View file

@ -433,9 +433,12 @@ where
// We don't request those items from them, they will send them. // We don't request those items from them, they will send them.
// We only bother with pushing items that differ // We only bother with pushing items that differ
} }
MerkleNode::Leaf(ik, _) => { MerkleNode::Leaf(ik, ivhash) => {
// Just send that item directly // Just send that item directly
if let Some(val) = self.data.store.get(ik)? { if let Some(val) = self.data.store.get(&ik[..])? {
if blake2sum(&val[..]) != ivhash {
warn!("Hashes differ between stored value and Merkle tree, key: {:?} (if your server is very busy, don't worry, this happens when the Merkle tree can't be updated fast enough)", ik);
}
todo_items.push(val.to_vec()); todo_items.push(val.to_vec());
} }
} }