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

btrbk: corrected checks on vol_info, globally use subvol() to get a subvolume node

pull/30/head
Axel Burri 2014-12-19 14:37:30 +01:00
parent 51367b0e63
commit f3e98ced61
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
btrbk
View File

@ -118,15 +118,14 @@ sub run_cmd($;$)
} }
sub check_vol($$) sub subvol($$)
{ {
my $root = shift; my $root = shift;
my $vol = shift; my $vol = shift;
die("subvolume info not present: $root") unless(exists($vol_info{$root})); if($vol_info{$root} && $vol_info{$root}->{$vol}) {
foreach (values %{$vol_info{$root}}) { return $vol_info{$root}->{$vol};
return 1 if($_->{FS_PATH} eq "$root/$vol");
} }
return 0; return undef;
} }
@ -448,13 +447,12 @@ sub get_children($$)
{ {
my $sroot = shift; my $sroot = shift;
my $svol = shift; my $svol = shift;
die("root subvolume info not present: $sroot") unless(exists($vol_info{$sroot})); my $svol_href = subvol($sroot, $svol);
die("subvolume info not present: $sroot/$svol") unless(exists($vol_info{$sroot}->{$svol})); die("subvolume info not present: $sroot/$svol") unless($svol_href);
my $uuid = $vol_info{$sroot}->{$svol}->{uuid};
DEBUG "Getting snapshot children of: $sroot/$svol"; DEBUG "Getting snapshot children of: $sroot/$svol";
my @ret; my @ret;
foreach (values %{$vol_info{$sroot}}) { foreach (values %{$vol_info{$sroot}}) {
next unless($_->{parent_uuid} eq $uuid); next unless($_->{parent_uuid} eq $svol_href->{uuid});
DEBUG "Found snapshot child: $_->{SUBVOL_PATH}"; DEBUG "Found snapshot child: $_->{SUBVOL_PATH}";
push(@ret, $_); push(@ret, $_);
} }
@ -466,8 +464,8 @@ sub get_receive_targets_by_uuid($$)
{ {
my $droot = shift; my $droot = shift;
my $uuid = shift; my $uuid = shift;
die("root subvolume info not present: $droot") unless(exists($vol_info{$droot})); die("root subvolume info not present: $droot") unless($vol_info{$droot});
die("subvolume info not present: $uuid") unless(exists($uuid_info{$uuid})); die("subvolume info not present: $uuid") unless($uuid_info{$uuid});
DEBUG "Getting receive targets in \"$droot/\" for: $uuid_info{$uuid}->{FS_PATH}"; DEBUG "Getting receive targets in \"$droot/\" for: $uuid_info{$uuid}->{FS_PATH}";
my @ret; my @ret;
foreach (values %{$vol_info{$droot}}) { foreach (values %{$vol_info{$droot}}) {
@ -485,8 +483,8 @@ sub get_latest_common($$$)
my $svol = shift; my $svol = shift;
my $droot = shift; my $droot = shift;
die("source subvolume info not present: $sroot") unless(exists($vol_info{$sroot})); die("source subvolume info not present: $sroot") unless($vol_info{$sroot});
die("target subvolume info not present: $droot") unless(exists($vol_info{$droot})); die("target subvolume info not present: $droot") unless($vol_info{$droot});
# sort children of svol descending by generation # sort children of svol descending by generation
foreach my $child (sort { $b->{gen} <=> $a->{gen} } get_children($sroot, $svol)) { foreach my $child (sort { $b->{gen} <=> $a->{gen} } get_children($sroot, $svol)) {
@ -636,7 +634,7 @@ MAIN:
my $svol = $job->{svol} || die; my $svol = $job->{svol} || die;
$vol_info{$sroot} //= btr_subtree($sroot); $vol_info{$sroot} //= btr_subtree($sroot);
$vol_info{$droot} //= btr_subtree($droot); $vol_info{$droot} //= btr_subtree($droot);
unless($vol_info{$sroot} && $vol_info{$droot} && $vol_info{$sroot}->{$svol}) { unless(subvol($sroot, $svol) && $vol_info{$droot}) {
ERROR "Failed to read btrfs subvolume information, aborting job"; ERROR "Failed to read btrfs subvolume information, aborting job";
$job->{ABORTED} = 1; $job->{ABORTED} = 1;
next; next;
@ -705,7 +703,7 @@ MAIN:
my $droot = $job->{droot} || die; my $droot = $job->{droot} || die;
my $type = $job->{type} || die; my $type = $job->{type} || die;
unless(check_vol($sroot, $svol)) { unless(subvol($sroot, $svol)) {
WARN "Source subvolume not found, aborting job: $sroot/$svol"; WARN "Source subvolume not found, aborting job: $sroot/$svol";
$job->{ABORTED} = 1; $job->{ABORTED} = 1;
next; next;
@ -726,13 +724,14 @@ MAIN:
do { do {
$postfix_counter++; $postfix_counter++;
$postfix = '.' . $timestamp . ($postfix_counter ? "_$postfix_counter" : ""); $postfix = '.' . $timestamp . ($postfix_counter ? "_$postfix_counter" : "");
TRACE "Testing source snapshot name: $snapdir$svol$postfix" TRACE "Testing source snapshot name: $snapdir$svol$postfix";
} while(check_vol($sroot, "$snapdir$svol$postfix")); # NOTE: $snapdir always has trailing slash! } while(subvol($sroot, "$snapdir$svol$postfix")); # NOTE: $snapdir always has trailing slash!
$snapshot = "$sroot/$snapdir$svol$postfix"; $snapshot = "$sroot/$snapdir$svol$postfix";
$snapshot_name = "$svol$postfix"; $snapshot_name = "$svol$postfix";
} }
if(check_vol($droot, $snapshot_name)) { if(subvol($droot, $snapshot_name)) {
# TODO: this seems not right here: maybe just skip this check, and panic later
WARN "Snapshot already exists at destination, aborting job: $droot/$snapshot_name"; WARN "Snapshot already exists at destination, aborting job: $droot/$snapshot_name";
$job->{ABORTED} = 1; $job->{ABORTED} = 1;
next; next;