diff options
| author | Alex Auvolat <alex@adnab.me> | 2021-03-12 14:37:46 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2021-03-12 14:37:46 +0100 |
| commit | 7fdaf7aef0c2aa8b38dbc7dac630f6f9baf8f0a4 (patch) | |
| tree | c7b212ed0333dfc57bb39370d85060d1d1a103eb /src/table/sync.rs | |
| parent | 1ec49980ec876ef9395a9ae088f82d86a1a0d9f6 (diff) | |
| download | garage-7fdaf7aef0c2aa8b38dbc7dac630f6f9baf8f0a4.tar.gz garage-7fdaf7aef0c2aa8b38dbc7dac630f6f9baf8f0a4.zip | |
Fix merkle updater not being notified; improved logging
Diffstat (limited to 'src/table/sync.rs')
| -rw-r--r-- | src/table/sync.rs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/table/sync.rs b/src/table/sync.rs index 07d48155..dbfa0a9f 100644 --- a/src/table/sync.rs +++ b/src/table/sync.rs @@ -274,7 +274,7 @@ where .into_iter() .collect::<Vec<_>>(); if nodes.contains(&self.aux.system.id) { - warn!("Interrupting offload as partitions seem to have changed"); + warn!("({}) Interrupting offload as partitions seem to have changed", self.data.name); break; } if nodes.len() < self.aux.replication.write_quorum(&self.aux.system) { @@ -282,8 +282,9 @@ where } counter += 1; - debug!( - "Offloading {} items from {:?}..{:?} ({})", + info!( + "({}) Offloading {} items from {:?}..{:?} ({})", + self.data.name, items.len(), begin, end, @@ -325,7 +326,7 @@ where } if not_removed > 0 { - debug!("{} items not removed during offload because they changed in between (trying again...)", not_removed); + debug!("({}) {} items not removed during offload because they changed in between (trying again...)", self.data.name, not_removed); } Ok(()) @@ -448,11 +449,11 @@ where // Just send that item directly 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); + 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)", self.data.name, ik); } todo_items.push(val.to_vec()); } else { - warn!("Item from Merkle tree not found in store: {:?} (if your server is very busy, don't worry, this happens when the Merkle tree can't be updated fast enough)", ik); + warn!("({}) Item from Merkle tree not found in store: {:?} (if your server is very busy, don't worry, this happens when the Merkle tree can't be updated fast enough)", self.data.name, ik); } } MerkleNode::Intermediate(l) => { |