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

btrbk: allow multiple identical src/target subvolumes

pull/30/head
Axel Burri 2015-04-20 18:19:55 +02:00
parent e25312223d
commit 6b00ea1741
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
btrbk
View File

@ -201,7 +201,7 @@ sub vinfo_root($$)
{ {
my $url = shift // die; my $url = shift // die;
my $config = shift || die; my $config = shift || die;
die if($vinfo_root{$url}); return $vinfo_root{$url} if($vinfo_root{$url});
my $name = $url; my $name = $url;
$name =~ s/^.*\///; $name =~ s/^.*\///;
@ -321,12 +321,14 @@ sub vinfo_set_detail($$)
sub vinfo_read_detail($) sub vinfo_read_detail($)
{ {
my $vol = shift || die; my $vol = shift || die;
return $vol if($vol->{VINFO_DETAIL_READ});
my $detail = btr_subvolume_detail($vol); my $detail = btr_subvolume_detail($vol);
unless($detail) { unless($detail) {
WARN "Failed to fetch subvolume detail for: $vol->{PRINT}"; WARN "Failed to fetch subvolume detail for: $vol->{PRINT}";
return undef; return undef;
} }
$vol->{VINFO_DETAIL_READ} = 1;
return vinfo_set_detail($vol, $detail); return vinfo_set_detail($vol, $detail);
} }
@ -906,6 +908,8 @@ sub _subtree_list
sub vinfo_read_subvolumes($) sub vinfo_read_subvolumes($)
{ {
my $vol = shift || die; my $vol = shift || die;
return $vol if($vol->{VINFO_SUBVOLUMES_READ});
my $url = $vol->{URL} || die; my $url = $vol->{URL} || die;
my $tree = btr_tree($vol); # populates %uuid_info my $tree = btr_tree($vol); # populates %uuid_info
@ -947,6 +951,7 @@ sub vinfo_read_subvolumes($)
} }
DEBUG "Added " . scalar(keys %ret) . " subvolume children to: $vol->{PRINT}"; DEBUG "Added " . scalar(keys %ret) . " subvolume children to: $vol->{PRINT}";
$vol->{VINFO_SUBVOLUMES_READ} = 1;
TRACE(Data::Dumper->Dump([\%ret], ["SUBVOL_INFO{$vol->{URL}}"])); TRACE(Data::Dumper->Dump([\%ret], ["SUBVOL_INFO{$vol->{URL}}"]));
return \%ret; return \%ret;
@ -1583,6 +1588,7 @@ MAIN:
# fill vinfo hash, basic checks on configuration # fill vinfo hash, basic checks on configuration
# #
my %snapshot_check; my %snapshot_check;
my %backup_check;
foreach my $config_vol (@{$config->{VOLUME}}) foreach my $config_vol (@{$config->{VOLUME}})
{ {
next if($config_vol->{ABORTED}); next if($config_vol->{ABORTED});
@ -1641,12 +1647,12 @@ MAIN:
# check for duplicate snapshot locations # check for duplicate snapshot locations
my $snapshot_backup_target = "$droot->{REAL_URL}/$snapshot_basename"; my $snapshot_backup_target = "$droot->{REAL_URL}/$snapshot_basename";
if(my $prev = $snapshot_check{$snapshot_backup_target}) { if(my $prev = $backup_check{$snapshot_backup_target}) {
ERROR "Subvolume \"$prev\" and \"$svol->{PRINT}\" will create same snapshot: $snapshot_target"; ERROR "Subvolume \"$prev\" and \"$svol->{PRINT}\" will create same backup target: $snapshot_target";
ERROR "Please fix \"snapshot_name\" configuration options!"; ERROR "Please fix \"snapshot_name\" or \"target\" configuration options!";
exit 1; exit 1;
} }
$snapshot_check{$snapshot_backup_target} = $svol->{PRINT}; $backup_check{$snapshot_backup_target} = $svol->{PRINT};
unless(vinfo_read_subvolumes($droot)) { unless(vinfo_read_subvolumes($droot)) {
$config_target->{ABORTED} = "Failed to fetch subvolume list"; $config_target->{ABORTED} = "Failed to fetch subvolume list";