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

btrbk: list unexpected archive targets when aborting

pull/542/head
Axel Burri 2022-06-05 17:35:20 +02:00
parent 61691abbfc
commit d498dbb5c3
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
btrbk
View File

@ -3443,7 +3443,7 @@ sub get_receive_targets($$;@)
my @ret; my @ret;
my @correlated = _correlated_nodes($droot->{node}, $src_vol->{node}); my @correlated = _correlated_nodes($droot->{node}, $src_vol->{node});
my $unexpected; my @unexpected;
foreach (@correlated) { foreach (@correlated) {
my $vinfo = vinfo_resolved($_, $droot); # returns undef if not below $droot my $vinfo = vinfo_resolved($_, $droot); # returns undef if not below $droot
if(exists($_->{BTRBK_RAW})) { if(exists($_->{BTRBK_RAW})) {
@ -3457,7 +3457,7 @@ sub get_receive_targets($$;@)
} }
else { else {
TRACE "get_receive_targets: skip unexpected match: " . _fs_path($_) if($do_trace); TRACE "get_receive_targets: skip unexpected match: " . _fs_path($_) if($do_trace);
$unexpected = 1; push @unexpected, { src_vol => $src_vol, target_node => $_ };
if($opts{warn} && config_key($droot, "warn_unknown_targets")) { if($opts{warn} && config_key($droot, "warn_unknown_targets")) {
WARN "Receive target of \"$src_vol->{PRINT}\" exists at unknown location: " . ($vinfo ? $vinfo->{PRINT} : _fs_path($_)); WARN "Receive target of \"$src_vol->{PRINT}\" exists at unknown location: " . ($vinfo ? $vinfo->{PRINT} : _fs_path($_));
} }
@ -3465,7 +3465,7 @@ sub get_receive_targets($$;@)
} }
push(@ret, $vinfo); push(@ret, $vinfo);
} }
${$opts{ret_unexpected_only}} = 1 if($opts{ret_unexpected_only} && $unexpected && !scalar(@ret)); push(@{$opts{ret_unexpected_only}}, @unexpected) if($opts{ret_unexpected_only} && scalar(@unexpected) && !scalar(@ret));
return @ret; return @ret;
} }
@ -4559,14 +4559,14 @@ sub macro_archive_target($$$;$)
my @schedule; my @schedule;
# NOTE: this is pretty much the same as "resume missing" # NOTE: this is pretty much the same as "resume missing"
my $has_unexpected_location = 0; my $unexpected_only = [];
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')})
{ {
if(my $ff = vinfo_match(\@exclude_vf, $svol)) { if(my $ff = vinfo_match(\@exclude_vf, $svol)) {
INFO "Skipping archive candidate \"$svol->{PRINT}\": Match on exclude pattern \"$ff->{unparsed}\""; INFO "Skipping archive candidate \"$svol->{PRINT}\": Match on exclude pattern \"$ff->{unparsed}\"";
next; next;
} }
next if(get_receive_targets($droot, $svol, exact => 1, warn => 1, ret_unexpected_only => \$has_unexpected_location)); next if(get_receive_targets($droot, $svol, exact => 1, warn => 1, ret_unexpected_only => $unexpected_only));
DEBUG "Adding archive candidate: $svol->{PRINT}"; DEBUG "Adding archive candidate: $svol->{PRINT}";
push @schedule, { value => $svol, push @schedule, { value => $svol,
@ -4575,9 +4575,12 @@ sub macro_archive_target($$$;$)
}; };
} }
if($has_unexpected_location) { if(scalar @$unexpected_only) {
ABORTED($droot, "Receive targets of archive candidates exist at unexpected location"); ABORTED($droot, "Receive targets of archive candidates exist at unexpected location only");
WARN "Skipping archiving of \"$sroot->{PRINT}/${snapshot_name}.*\": " . ABORTED_TEXT($droot); WARN "Skipping archiving of \"$sroot->{PRINT}/${snapshot_name}.*\": " . ABORTED_TEXT($droot),
"Please check your target configuration, or fix manually by running" . ($droot->{URL_PREFIX} ? " (on $droot->{URL_PREFIX}):" : ":"),
"`btrfs subvolume snapshot -r <found> <target>`",
map { "target: $droot->{PATH}/$_->{src_vol}{NAME}, found: " . _fs_path($_->{target_node}) } @$unexpected_only;
return undef; return undef;
} }