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

btrbk: archive: also apply exclude patterns on source subvolumes 

Allows patterns like "svol.2019*".

Needs @exclude_vf to be a global variable, which is ok as this only
holds command-line args (and global context for archive_exclude).

Note that adding the same in "create backups" (action run) and
macro_delete() is not a good idea, as this has weird implications on
the "forced: last" snapshot/backup pair.
pull/293/head
Axel Burri 2019-08-04 21:37:17 +02:00
parent 6e55e08db7
commit dcc57abac4
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
btrbk
View File

@ -280,6 +280,7 @@ my $fake_uuid_prefix = 'XXXXXXXX-XXXX-XXXX-XXXX-'; # plus 0-padded inject_id: XX
my $dryrun; my $dryrun;
my $loglevel = 1; my $loglevel = 1;
my $quiet; my $quiet;
my @exclude_vf;
my $do_dumper; my $do_dumper;
my $show_progress = 0; my $show_progress = 0;
my $err = ""; my $err = "";
@ -4191,6 +4192,10 @@ sub macro_archive_target($$$;$)
foreach my $svol (@{vinfo_subvol_list($sroot, readonly => 1, btrbk_direct_leaf => $snapshot_name, sort => 'path')}) foreach my $svol (@{vinfo_subvol_list($sroot, readonly => 1, btrbk_direct_leaf => $snapshot_name, sort => 'path')})
{ {
next if(get_receive_targets($droot, $svol, exact => 1, warn => 1, ret_unexpected => \$has_unexpected_location)); next if(get_receive_targets($droot, $svol, exact => 1, warn => 1, ret_unexpected => \$has_unexpected_location));
if(my $ff = vinfo_match(\@exclude_vf, $svol)) {
INFO "Skipping archive candidate \"$svol->{PRINT}\": Match on exclude pattern \"$ff->{unparsed}\"";
next;
}
DEBUG "Adding archive candidate: $svol->{PRINT}"; DEBUG "Adding archive candidate: $svol->{PRINT}";
push @schedule, { value => $svol, push @schedule, { value => $svol,
@ -5092,7 +5097,6 @@ MAIN:
} }
push @filter_vf, $vf; push @filter_vf, $vf;
} }
my @exclude_vf;
foreach (@exclude_cmdline) { foreach (@exclude_cmdline) {
my $vf = vinfo_filter_statement($_); my $vf = vinfo_filter_statement($_);
unless($vf) { unless($vf) {
@ -5444,7 +5448,7 @@ MAIN:
if(vinfo_match(\@exclude_vf, $sroot) || if(vinfo_match(\@exclude_vf, $sroot) ||
vinfo_match(\@exclude_vf, vinfo_child($sroot, $snapshot_name))) vinfo_match(\@exclude_vf, vinfo_child($sroot, $snapshot_name)))
{ {
ABORTED($sroot, "skip_archive_exclude", "Match on archive_exclude"); ABORTED($sroot, "skip_archive_exclude", "Match on exclude pattern");
INFO "Skipping archive subvolumes \"$sroot->{PRINT}/${snapshot_name}.*\": " . ABORTED_TEXT($sroot); INFO "Skipping archive subvolumes \"$sroot->{PRINT}/${snapshot_name}.*\": " . ABORTED_TEXT($sroot);
next; next;
} }