diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-06-28 17:42:54 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-06-28 17:42:54 +0200 |
| commit | 368414a261345088b30c57e87ee29a29026672a8 (patch) | |
| tree | ae35c07697ccfa2a60e417a5cc31a60424d4c298 | |
| parent | fc2bc8b0cac3c407ea0aa4bb004ea8c0a15a9120 (diff) | |
| download | garage-368414a261345088b30c57e87ee29a29026672a8.tar.gz garage-368414a261345088b30c57e87ee29a29026672a8.zip | |
Small things
| -rw-r--r-- | src/block/repair.rs | 3 | ||||
| -rw-r--r-- | src/garage/repair/online.rs | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/block/repair.rs b/src/block/repair.rs index f1df49e0..284a8846 100644 --- a/src/block/repair.rs +++ b/src/block/repair.rs @@ -381,7 +381,7 @@ impl BlockStoreIterator { } } - /// Returns progress done, between 0% and 1% + /// Returns progress done, between 0 and 1 fn progress(&self) -> f32 { if self.path.is_empty() { 1.0 @@ -453,7 +453,6 @@ impl BlockStoreIterator { if name.len() == 2 && hex::decode(&name).is_ok() && ent_type.is_dir() { let path = data_dir_ent.path(); self.path.push(ReadingDir::Pending(path)); - continue; } else if name.len() == 64 { let hash_bytes = if let Ok(h) = hex::decode(&name) { h diff --git a/src/garage/repair/online.rs b/src/garage/repair/online.rs index d4366486..f0d4b847 100644 --- a/src/garage/repair/online.rs +++ b/src/garage/repair/online.rs @@ -85,6 +85,10 @@ impl Worker for RepairVersionsWorker { "Version repair worker".into() } + fn info(&self) -> Option<String> { + Some(format!("{} items done", self.counter)) + } + async fn work( &mut self, _must_exit: &mut watch::Receiver<bool>, @@ -165,6 +169,10 @@ impl Worker for RepairBlockrefsWorker { "Block refs repair worker".into() } + fn info(&self) -> Option<String> { + Some(format!("{} items done", self.counter)) + } + async fn work( &mut self, _must_exit: &mut watch::Receiver<bool>, |