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

btrbk: dont ignore non-btrbk files in "resolve targets"; print debug when ignoring non-btrbk files in other places

pull/57/head
Axel Burri 2015-10-20 13:57:29 +02:00
parent 05bfeaff1b
commit 40a384e7c7
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
btrbk
View File

@ -2842,8 +2842,6 @@ MAIN:
next if($config_target->{ABORTED}); next if($config_target->{ABORTED});
my $droot = $config_target->{droot} || die; my $droot = $config_target->{droot} || die;
foreach my $target_vol (sort { $a->{SUBVOL_PATH} cmp $b->{SUBVOL_PATH} } values %{vinfo_subvol_list($droot)}) { foreach my $target_vol (sort { $a->{SUBVOL_PATH} cmp $b->{SUBVOL_PATH} } values %{vinfo_subvol_list($droot)}) {
my $filename_info = parse_filename($target_vol->{SUBVOL_PATH}, $snapshot_name, ($config_target->{target_type} eq "raw"));
next unless($filename_info); # ignore non-btrbk files
my $parent_snapshot; my $parent_snapshot;
foreach (get_snapshot_children($sroot, $svol)) { foreach (get_snapshot_children($sroot, $svol)) {
if($_->{uuid} eq $target_vol->{received_uuid}) { if($_->{uuid} eq $target_vol->{received_uuid}) {
@ -3050,7 +3048,10 @@ MAIN:
foreach my $child (sort { $a->{cgen} <=> $b->{cgen} } get_snapshot_children($sroot, $svol)) foreach my $child (sort { $a->{cgen} <=> $b->{cgen} } get_snapshot_children($sroot, $svol))
{ {
my $filename_info = parse_filename($child->{SUBVOL_PATH}, $snapdir . $snapshot_basename); my $filename_info = parse_filename($child->{SUBVOL_PATH}, $snapdir . $snapshot_basename);
next unless($filename_info); # ignore non-btrbk files unless($filename_info) {
DEBUG "Receive target does not match btrbk filename scheme, skipping: $child->{PRINT}";
next;
}
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}";
@ -3077,7 +3078,10 @@ MAIN:
# these are needed for correct results of schedule() # these are needed for correct results of schedule()
foreach my $vol (values %{vinfo_subvol_list($droot)}) { foreach my $vol (values %{vinfo_subvol_list($droot)}) {
my $filename_info = parse_filename($vol->{SUBVOL_PATH}, $snapshot_basename, ($config_target->{target_type} eq "raw")); my $filename_info = parse_filename($vol->{SUBVOL_PATH}, $snapshot_basename, ($config_target->{target_type} eq "raw"));
next unless($filename_info); # ignore non-btrbk files unless($filename_info) {
DEBUG "Resume candidate does not match btrbk filename scheme, skipping: $vol->{PRINT}";
next;
}
push(@schedule, { value => undef, push(@schedule, { value => undef,
btrbk_date => $filename_info->{btrbk_date}, btrbk_date => $filename_info->{btrbk_date},
preserve => $vol->{FORCE_PRESERVE}, preserve => $vol->{FORCE_PRESERVE},
@ -3199,7 +3203,10 @@ MAIN:
my @schedule; my @schedule;
foreach my $vol (values %{vinfo_subvol_list($droot)}) { foreach my $vol (values %{vinfo_subvol_list($droot)}) {
my $filename_info = parse_filename($vol->{SUBVOL_PATH}, $snapshot_basename, ($config_target->{target_type} eq "raw")); my $filename_info = parse_filename($vol->{SUBVOL_PATH}, $snapshot_basename, ($config_target->{target_type} eq "raw"));
next unless($filename_info); # ignore non-btrbk files unless($filename_info) {
DEBUG "Receive target does not match btrbk filename scheme, skipping: $vol->{PRINT}";
next;
}
# NOTE: checking received_uuid does not make much sense, as this received_uuid is propagated to snapshots # NOTE: checking received_uuid does not make much sense, as this received_uuid is propagated to snapshots
# if($vol->{received_uuid} && ($vol->{received_uuid} eq '-')) { # if($vol->{received_uuid} && ($vol->{received_uuid} eq '-')) {
@ -3249,7 +3256,10 @@ MAIN:
my @schedule; my @schedule;
foreach my $vol (values %{vinfo_subvol_list($sroot)}) { foreach my $vol (values %{vinfo_subvol_list($sroot)}) {
my $filename_info = parse_filename($vol->{SUBVOL_PATH}, $snapdir . $snapshot_basename); my $filename_info = parse_filename($vol->{SUBVOL_PATH}, $snapdir . $snapshot_basename);
next unless($filename_info); # ignore non-btrbk files unless($filename_info) {
DEBUG "Snapshot does not match btrbk filename scheme, skipping: $vol->{PRINT}";
next;
}
push(@schedule, { value => $vol, push(@schedule, { value => $vol,
name => $vol->{PRINT}, # only for logging name => $vol->{PRINT}, # only for logging
btrbk_date => $filename_info->{btrbk_date} btrbk_date => $filename_info->{btrbk_date}