aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2022-09-20 15:19:58 +0200
committerAlex Auvolat <alex@adnab.me>2022-09-20 15:19:58 +0200
commit357b72f4ff721fcf4dd92c1f410c5f92d4fb9ab0 (patch)
treedc063f42f28e34cbfc45c594df54aba5e2c01af4 /src
parent56592e18538b379ccaaa7b7c1990a599ac83b191 (diff)
parent2c312e9cbd58368484e9acb043b7c9d0ebb8905c (diff)
downloadgarage-357b72f4ff721fcf4dd92c1f410c5f92d4fb9ab0.tar.gz
garage-357b72f4ff721fcf4dd92c1f410c5f92d4fb9ab0.zip
Merge branch 'main' into configurable-timeouts
Diffstat (limited to 'src')
-rw-r--r--src/table/Cargo.toml1
-rw-r--r--src/table/sync.rs4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/table/Cargo.toml b/src/table/Cargo.toml
index ae52e8d7..38c6b41c 100644
--- a/src/table/Cargo.toml
+++ b/src/table/Cargo.toml
@@ -22,6 +22,7 @@ opentelemetry = "0.17"
async-trait = "0.1.7"
bytes = "1.0"
+hex = "0.4"
hexdump = "0.1"
tracing = "0.1.30"
rand = "0.8"
diff --git a/src/table/sync.rs b/src/table/sync.rs
index 76402d28..e34aa8d7 100644
--- a/src/table/sync.rs
+++ b/src/table/sync.rs
@@ -345,11 +345,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)", F::TABLE_NAME, ik);
+ debug!("({}) 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)", F::TABLE_NAME, hex::encode(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)", F::TABLE_NAME, ik);
+ debug!("({}) 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)", F::TABLE_NAME, hex::encode(ik));
}
}
MerkleNode::Intermediate(l) => {