delete/gc stats include elapsed time

Author: sourcefrog

src/archive.rs

@@ -1,5 +1,5 @@
 // Conserve backup system.
-// Copyright 2015, 2016, 2017, 2018, 2019, 2020 Martin Pool.
+// Copyright 2015, 2016, 2017, 2018, 2019, 2020, 2021 Martin Pool.
 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@ use std::collections::{HashMap, HashSet};
 use std::io::ErrorKind;
 use std::path::Path;
 use std::sync::Mutex;
+use std::time::Instant;
 
 use rayon::prelude::*;
 use serde::{Deserialize, Serialize};
@@ -245,6 +246,7 @@ impl Archive {
     pub fn delete_unreferenced(&self, options: &DeleteOptions) -> Result<DeleteStats> {
         let block_dir = self.block_dir();
         let mut stats = DeleteStats::default();
+        let start = Instant::now();
         let delete_guard = if options.break_lock {
             gc_lock::GarbageCollectionLock::break_lock(self)?
         } else {
@@ -288,16 +290,18 @@ impl Archive {
             stats.deleted_block_count += blocks.len() - error_count;
         }
 
+        stats.elapsed = start.elapsed();
         Ok(stats)
     }
 
-    /// Delete bands, and the blocks that they referenec.
+    /// Delete bands, and the blocks that they reference.
     pub fn delete_bands(
         &self,
         band_ids: &[BandId],
         options: &DeleteOptions,
     ) -> Result<DeleteStats> {
         let mut stats = DeleteStats::default();
+        let start = Instant::now();
         for band_id in band_ids {
             if !options.dry_run {
                 Band::delete(self, band_id).map(|()| stats.deleted_band_count += 1)?
@@ -306,6 +310,7 @@ impl Archive {
         if !options.no_gc {
             stats += self.delete_unreferenced(options)?;
         }
+        stats.elapsed = start.elapsed();
         Ok(stats)
     }
 

src/stats.rs

@@ -13,10 +13,12 @@
 
 use std::fmt;
 use std::io;
+use std::time::Duration;
 
 use derive_more::{Add, AddAssign};
 use thousands::Separable;
 
+use crate::ui::duration_to_hms;
 use crate::*;
 
 pub fn mb_string(s: u64) -> String {
@@ -55,6 +57,10 @@ fn write_count<I: Into<usize>>(w: &mut fmt::Formatter<'_>, label: &str, value: I
     .unwrap();
 }
 
+fn write_duration(w: &mut fmt::Formatter<'_>, label: &str, duration: Duration) -> fmt::Result {
+    writeln!(w, "{:>12}      {}", duration_to_hms(duration), label)
+}
+
 /// Describes sizes of data read or written, with both the
 /// compressed and uncompressed size.
 #[derive(Add, AddAssign, Clone, Copy, Debug, Default, Eq, PartialEq)]
@@ -278,6 +284,7 @@ pub struct DeleteStats {
     pub unreferenced_block_bytes: u64,
     pub deletion_errors: usize,
     pub deleted_block_count: usize,
+    pub elapsed: Duration,
 }
 
 impl fmt::Display for DeleteStats {
@@ -293,6 +300,9 @@ impl fmt::Display for DeleteStats {
         writeln!(w)?;
 
         write_count(w, "deletion errors", self.deletion_errors);
+        writeln!(w)?;
+
+        write_duration(w, "elapsed", self.elapsed)?;
 
         Ok(())
     }

tests/gc.rs

@@ -1,4 +1,4 @@
-// Copyright 2015, 2016, 2017, 2019, 2020 Martin Pool.
+// Copyright 2015, 2016, 2017, 2019, 2020, 2021 Martin Pool.
 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -50,6 +50,7 @@ fn unreferenced_blocks() {
             deletion_errors: 0,
             deleted_block_count: 0,
             deleted_band_count: 0,
+            elapsed: delete_stats.elapsed,
         }
     );
 
@@ -68,6 +69,7 @@ fn unreferenced_blocks() {
             deletion_errors: 0,
             deleted_block_count: 1,
             deleted_band_count: 0,
+            elapsed: delete_stats.elapsed,
         }
     );
 
@@ -81,6 +83,7 @@ fn unreferenced_blocks() {
             deletion_errors: 0,
             deleted_block_count: 0,
             deleted_band_count: 0,
+            elapsed: delete_stats.elapsed,
         }
     );
 }