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

btrbk: bugfix: raw targets: do not inject child if add_btrbk_filename_info() failed

pull/88/head
Axel Burri 2016-04-25 20:49:17 +02:00
parent 81feb41619
commit 082754173c
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
btrbk
View File

@ -1537,8 +1537,9 @@ sub add_btrbk_filename_info($;$)
# NOTE: unless long-iso file format is encountered, the timestamp is interpreted in local timezone. # NOTE: unless long-iso file format is encountered, the timestamp is interpreted in local timezone.
$name =~ s/^(.*)\///; $name =~ s/^(.*)\///;
my $btrbk_raw;
if($btrbk_raw_file && ($name =~ /^(?<name>$file_match)$timestamp_postfix_match$raw_postfix_match$/)) { if($btrbk_raw_file && ($name =~ /^(?<name>$file_match)$timestamp_postfix_match$raw_postfix_match$/)) {
$node->{BTRBK_RAW} = { $btrbk_raw = {
received_uuid => $+{received_uuid} // die, received_uuid => $+{received_uuid} // die,
remote_parent_uuid => $+{parent_uuid} // '-', remote_parent_uuid => $+{parent_uuid} // '-',
encrypt => $+{encrypt} // "", encrypt => $+{encrypt} // "",
@ -1589,6 +1590,7 @@ sub add_btrbk_filename_info($;$)
$node->{BTRBK_BASENAME} = $name; $node->{BTRBK_BASENAME} = $name;
$node->{BTRBK_DATE} = [ $time, $NN ]; $node->{BTRBK_DATE} = [ $time, $NN ];
$node->{BTRBK_RAW} = $btrbk_raw if($btrbk_raw);
return $node; return $node;
} }
@ -1776,7 +1778,7 @@ sub vinfo_inject_child($$$)
id => $tree_inject_id, id => $tree_inject_id,
uuid => $uuid, uuid => $uuid,
}; };
add_btrbk_filename_info($node, 1); return undef unless(add_btrbk_filename_info($node, 1));
# NOTE: make sure to have all the flags set by _vinfo_subtree_list() # NOTE: make sure to have all the flags set by _vinfo_subtree_list()
$vinfo_child->{subtree_depth} = 0; $vinfo_child->{subtree_depth} = 0;
@ -4209,9 +4211,10 @@ MAIN:
# NOTE: remote_parent_uuid in BTRBK_RAW is the "parent of the source subvolume", NOT the # NOTE: remote_parent_uuid in BTRBK_RAW is the "parent of the source subvolume", NOT the
# "parent of the received subvolume". # "parent of the received subvolume".
my $subvol = vinfo_child($droot, $file); my $subvol = vinfo_child($droot, $file);
vinfo_inject_child($droot, $subvol, { TARGET_TYPE => 'raw' }); unless(vinfo_inject_child($droot, $subvol, { TARGET_TYPE => 'raw' }) &&
defined($subvol->{node}{BTRBK_RAW}) &&
unless(defined($subvol->{node}{BTRBK_RAW}) && ($snapshot_basename eq $subvol->{node}{BTRBK_BASENAME})) { ($snapshot_basename eq $subvol->{node}{BTRBK_BASENAME}))
{
DEBUG "Skipping file (filename scheme mismatch): \"$file\""; DEBUG "Skipping file (filename scheme mismatch): \"$file\"";
next; next;
} }
@ -4255,7 +4258,7 @@ MAIN:
# For now, always preserve all raw files. # For now, always preserve all raw files.
# TODO: remove this line as soon as incremental rotation is implemented. # TODO: remove this line as soon as incremental rotation is implemented.
$subvol->{node}{FORCE_PRESERVE} = "preserve forced: parent of another raw target"; $subvol->{node}{FORCE_PRESERVE} = "preserve forced: raw target";
} }
# TRACE(Data::Dumper->Dump([\@subvol_list], ["vinfo_raw_subvol_list{$droot}"])); # TRACE(Data::Dumper->Dump([\@subvol_list], ["vinfo_raw_subvol_list{$droot}"]));
} }