ambiser
/
btrbk
mirror of https://github.com/digint/btrbk
9
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrbk: always use "cgen" for snapshots (correct handling after a "btrfs balance", where "gen" is set to current generation)

pull/30/head
Axel Burri 2015-05-28 14:39:12 +02:00
parent b4a9974c5d
commit bb7aa10b23
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
btrbk-current
* Use "cgen" for snapshot comparison.
btrbk-0.19.0 btrbk-0.19.0
* Added "snapshot_create onchange", which skips snapshot creation if * Added "snapshot_create onchange", which skips snapshot creation if

28
btrbk
View File

@ -47,7 +47,7 @@ use Date::Calc qw(Today Delta_Days Day_of_Week);
use Getopt::Std; use Getopt::Std;
use Data::Dumper; use Data::Dumper;
our $VERSION = "0.19.0"; our $VERSION = "0.19.1-dev";
our $AUTHOR = 'Axel Burri <axel@tty0.ch>'; our $AUTHOR = 'Axel Burri <axel@tty0.ch>';
our $PROJECT_HOME = '<http://www.digint.ch/btrbk/>'; our $PROJECT_HOME = '<http://www.digint.ch/btrbk/>';
@ -1141,7 +1141,7 @@ sub get_latest_common($$$;$)
my $sroot = shift || die; my $sroot = shift || die;
my $svol = shift // die; my $svol = shift // die;
my $droot = shift || die; my $droot = shift || die;
my $threshold_gen = shift; # skip all snapshot children with generation >= $threshold_gen my $threshold_gen = shift; # skip all snapshot children with generation (cgen) >= $threshold_gen
die("source subvolume info not present: $sroot->{URL}") unless($sroot->{URL}); die("source subvolume info not present: $sroot->{URL}") unless($sroot->{URL});
die("target subvolume info not present: $droot->{URL}") unless($droot->{URL}); die("target subvolume info not present: $droot->{URL}") unless($droot->{URL});
@ -1150,10 +1150,10 @@ sub get_latest_common($$$;$)
$debug_src .= "#" . $threshold_gen if($threshold_gen); $debug_src .= "#" . $threshold_gen if($threshold_gen);
# sort children of svol descending by generation # sort children of svol descending by generation
foreach my $child (sort { $b->{gen} <=> $a->{gen} } get_snapshot_children($sroot, $svol)) { foreach my $child (sort { $b->{cgen} <=> $a->{cgen} } get_snapshot_children($sroot, $svol)) {
TRACE "get_latest_common: checking source snapshot: $child->{SUBVOL_PATH}"; TRACE "get_latest_common: checking source snapshot: $child->{SUBVOL_PATH}";
if($threshold_gen && ($child->{gen} >= $threshold_gen)) { if($threshold_gen && ($child->{cgen} >= $threshold_gen)) {
TRACE "get_latest_common: skipped gen=$child->{gen} >= $threshold_gen: $child->{SUBVOL_PATH}"; TRACE "get_latest_common: skipped gen=$child->{cgen} >= $threshold_gen: $child->{SUBVOL_PATH}";
next; next;
} }
@ -1182,13 +1182,13 @@ sub get_latest_snapshot_child($$)
my $latest = undef; my $latest = undef;
my $gen = -1; my $gen = -1;
foreach (get_snapshot_children($sroot, $svol)) { foreach (get_snapshot_children($sroot, $svol)) {
if($_->{gen} > $gen) { if($_->{cgen} > $gen) {
$latest = $_; $latest = $_;
$gen = $_->{gen}; $gen = $_->{cgen};
} }
} }
if($latest) { if($latest) {
DEBUG "Latest snapshot child for \"$svol->{PRINT}#$svol->{gen}\" is: $latest->{PRINT}#$latest->{gen}"; DEBUG "Latest snapshot child for \"$svol->{PRINT}#$svol->{gen}\" is: $latest->{PRINT}#$latest->{cgen}";
} else { } else {
DEBUG "No latest snapshots found for: $svol->{PRINT}"; DEBUG "No latest snapshots found for: $svol->{PRINT}";
} }
@ -1814,7 +1814,7 @@ MAIN:
push @out, "|-- $svol->{PRINT}"; push @out, "|-- $svol->{PRINT}";
foreach my $snapshot (sort { $a->{PATH} cmp $b->{PATH} } get_snapshot_children($sroot, $svol)) foreach my $snapshot (sort { $a->{PATH} cmp $b->{PATH} } get_snapshot_children($sroot, $svol))
{ {
if($snapshot->{gen} == $svol->{gen}) { if($snapshot->{cgen} == $svol->{gen}) {
push @out, "| ^== $snapshot->{PATH}"; push @out, "| ^== $snapshot->{PATH}";
} else { } else {
push @out, "| ^-- $snapshot->{PATH}"; push @out, "| ^-- $snapshot->{PATH}";
@ -1886,12 +1886,12 @@ MAIN:
# check if latest snapshot is up-to-date with source subvolume (by generation) # check if latest snapshot is up-to-date with source subvolume (by generation)
my $latest = get_latest_snapshot_child($sroot, $svol); my $latest = get_latest_snapshot_child($sroot, $svol);
if($latest) { if($latest) {
if($latest->{gen} == $svol->{gen}) { if($latest->{cgen} == $svol->{gen}) {
INFO "Snapshot creation skipped: snapshot_create=onchange, snapshot is up-to-date: $latest->{PRINT}"; INFO "Snapshot creation skipped: snapshot_create=onchange, snapshot is up-to-date: $latest->{PRINT}";
$config_subvol->{SNAPSHOT_UP_TO_DATE} = $latest; $config_subvol->{SNAPSHOT_UP_TO_DATE} = $latest;
next; next;
} }
DEBUG "Snapshot creation enabled: snapshot_create=onchange, gen=$svol->{gen} > snapshot_gen=$latest->{gen}"; DEBUG "Snapshot creation enabled: snapshot_create=onchange, gen=$svol->{gen} > snapshot_cgen=$latest->{cgen}";
} }
else { else {
DEBUG "Snapshot creation enabled: snapshot_create=onchange, no snapshots found"; DEBUG "Snapshot creation enabled: snapshot_create=onchange, no snapshots found";
@ -1981,7 +1981,7 @@ MAIN:
my $resume_total = 0; my $resume_total = 0;
my $resume_success = 0; my $resume_success = 0;
foreach my $child (sort { $a->{gen} <=> $b->{gen} } get_snapshot_children($sroot, $svol)) foreach my $child (sort { $a->{cgen} <=> $b->{cgen} } get_snapshot_children($sroot, $svol))
{ {
if(scalar get_receive_targets($droot, $child)) { if(scalar get_receive_targets($droot, $child)) {
DEBUG "Found matching receive target, skipping: $child->{PRINT}"; DEBUG "Found matching receive target, skipping: $child->{PRINT}";
@ -2023,9 +2023,9 @@ MAIN:
my @resume = grep defined, @$preserve; # remove entries with no value from list (target subvolumes) my @resume = grep defined, @$preserve; # remove entries with no value from list (target subvolumes)
$resume_total = scalar @resume; $resume_total = scalar @resume;
foreach my $child (sort { $a->{gen} <=> $b->{gen} } @resume) { foreach my $child (sort { $a->{cgen} <=> $b->{cgen} } @resume) {
INFO "Resuming subvolume backup (send-receive) for: $child->{PRINT}"; INFO "Resuming subvolume backup (send-receive) for: $child->{PRINT}";
my ($latest_common_src, $latest_common_target) = get_latest_common($sroot, $svol, $droot, $child->{gen}); my ($latest_common_src, $latest_common_target) = get_latest_common($sroot, $svol, $droot, $child->{cgen});
if(macro_send_receive($config_target, if(macro_send_receive($config_target,
snapshot => $child, snapshot => $child,
target => $droot, target => $droot,