From 8a29ced0c9b9276b331f9d12ffe20b51e36a524d Mon Sep 17 00:00:00 2001 From: Axel Burri Date: Sun, 17 Jan 2016 18:56:14 +0100 Subject: [PATCH] btrbk: add up-to-date flag to stats; print "target/snapthot_name.*" instead of just "target" in stats --- btrbk | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/btrbk b/btrbk index 59aa110..5b288d5 100755 --- a/btrbk +++ b/btrbk @@ -2967,8 +2967,16 @@ MAIN: my $svol = $config_subvol->{svol} || die; my $snapshot_name = config_key($config_subvol, "snapshot_name") // die; my @snapshot_children = get_snapshot_children($sroot, $svol); - $stats_snapshots_total += scalar(@snapshot_children); - push @stats_data, [ $svol->{PRINT}, sprintf("%3u snapshots", scalar(@snapshot_children)) ]; + my $stats_snapshot_uptodate = ""; + foreach my $snapshot (@snapshot_children) { + if($snapshot->{cgen} == $svol->{gen}) { + $stats_snapshot_uptodate = " (up-to-date)"; + last; + } + } + push @stats_data, [ $svol->{PRINT}, sprintf("%4u snapshots$stats_snapshot_uptodate", scalar(@snapshot_children)) ]; + $stats_snapshots_total += scalar(@snapshot_children); # NOTE: this adds ALL snaphot children under $sroot (not only the ones created by btrbk!) + foreach my $config_target (@{$config_subvol->{TARGET}}) { next if($config_target->{ABORTED}); my $droot = $config_target->{droot} || die; @@ -3031,8 +3039,8 @@ MAIN: push @stats_detail, "$stats_orphaned orphaned" if($stats_orphaned); push @stats_detail, "$stats_incomplete incomplete" if($stats_incomplete); my $stats_detail_print = join(', ', @stats_detail); - $stats_detail_print = " ($stats_detail_print)" if($stats_detail_print); - push @stats_data, [ "^-- $droot->{PRINT}", sprintf("%3u backups$stats_detail_print", $stats_total) ]; + $stats_detail_print = " ($stats_detail_print)" if($stats_detail_print); + push @stats_data, [ "^-- $droot->{PRINT}/$snapshot_name.*", sprintf("%4u backups$stats_detail_print", $stats_total) ]; } } }