gsadmin/garage
1
0
Fork 0
mirror of https://github.com/deuxfleurs-org/garage.git synced 2026-08-06 21:03:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better prints again, and a great question

Browse Source
This commit is contained in:
Alex Auvolat
2020-04-16 19:57:13 +02:00
parent 2a05fd135a
commit 768d22ccdb
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/table_sync.rs
+9 -4
View File
@@ -149,9 +149,8 @@ impl<F: TableSchema + 'static> TableSyncer<F> {
}
async fn sync_partition(self: Arc<Self>, partition: &Partition, must_exit: &mut watch::Receiver<bool>) -> Result<(), Error> {
eprintln!("({}) Calculating root checksum for {:?}...", self.table.name, partition);
eprintln!("({}) Preparing to sync {:?}...", self.table.name, partition);
let root_cks = self.root_checksum(&partition.begin, &partition.end, must_exit).await?;
eprintln!("({}) Root checksum for {:?}: {:?}", self.table.name, partition, root_cks);
let nodes = self.table.system.ring.borrow().clone().walk_ring(&partition.begin, self.table.param.replication_factor);
let mut sync_futures = nodes.iter()
@@ -196,9 +195,14 @@ impl<F: TableSchema + 'static> TableSyncer<F> {
drop(cache);
let v = self.range_checksum_inner(&range, must_exit).await?;
eprintln!("({}) New checksum calculated for {}-{}/{}, {} children",
self.table.name,
hex::encode(&range.begin[..]),
hex::encode(&range.end[..]),
range.level,
v.children.len());
let mut cache = self.cache[range.level].lock().await;
eprintln!("({}) Checksum for {:?}: {:?}", self.table.name, range, v);
cache.insert(range.clone(), v.clone());
Ok(v)
}.boxed()
@@ -281,7 +285,8 @@ impl<F: TableSchema + 'static> TableSyncer<F> {
todo.push_back(root_ck);
while !todo.is_empty() && !*must_exit.borrow() {
eprintln!("({}) Sync with {:?}: {} remaining", self.table.name, who, todo.len());
let total_children = todo.iter().map(|x| x.children.len()).fold(0, |x, y| x + y);
eprintln!("({}) Sync with {:?}: {} ({}) remaining", self.table.name, who, todo.len(), total_children);
let end = std::cmp::min(16, todo.len());
let step = todo.drain(..end).collect::<Vec<_>>();