aboutsummaryrefslogtreecommitdiff
path: root/src/block
diff options
context:
space:
mode:
Diffstat (limited to 'src/block')
-rw-r--r--src/block/repair.rs13
-rw-r--r--src/block/resync.rs4
2 files changed, 10 insertions, 7 deletions
diff --git a/src/block/repair.rs b/src/block/repair.rs
index eed40599..1878027e 100644
--- a/src/block/repair.rs
+++ b/src/block/repair.rs
@@ -67,14 +67,17 @@ impl Worker for RepairWorker {
idx_bytes
};
WorkerStatus {
- progress: Some("Phase 1".into()),
- freeform: vec![format!("Now at: {}", hex::encode(idx_bytes))],
+ progress: Some("0.00%".into()),
+ freeform: vec![format!(
+ "Currently in phase 1, iterator position: {}",
+ hex::encode(idx_bytes)
+ )],
..Default::default()
}
}
Some(bi) => WorkerStatus {
progress: Some(format!("{:.2}%", bi.progress() * 100.)),
- freeform: vec!["Phase 2".into()],
+ freeform: vec!["Currently in phase 2".into()],
..Default::default()
},
}
@@ -291,11 +294,11 @@ impl Worker for ScrubWorker {
}
ScrubWorkerState::Paused(bsi, rt) => {
s.progress = Some(format!("{:.2}%", bsi.progress() * 100.));
- s.freeform = vec![format!("Paused, resumes at {}", msec_to_rfc3339(*rt))];
+ s.freeform = vec![format!("Scrub paused, resumes at {}", msec_to_rfc3339(*rt))];
}
ScrubWorkerState::Finished => {
s.freeform = vec![format!(
- "Completed {}",
+ "Last scrub completed at {}",
msec_to_rfc3339(self.persisted.time_last_complete_scrub)
)];
}
diff --git a/src/block/resync.rs b/src/block/resync.rs
index 875ead9b..55d28c14 100644
--- a/src/block/resync.rs
+++ b/src/block/resync.rs
@@ -257,7 +257,7 @@ impl BlockResyncManager {
if let Err(e) = &res {
manager.metrics.resync_error_counter.add(1);
- warn!("Error when resyncing {:?}: {}", hash, e);
+ error!("Error when resyncing {:?}: {}", hash, e);
let err_counter = match self.errors.get(hash.as_slice())? {
Some(ec) => ErrorCounter::decode(&ec).add1(now + 1),
@@ -482,7 +482,7 @@ impl Worker for ResyncWorker {
if self.index >= persisted.n_workers {
return WorkerStatus {
- freeform: vec!["(unused)".into()],
+ freeform: vec!["This worker is currently disabled".into()],
..Default::default()
};
}