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

btrbk: adapted btrfs_subvolume_delete()

pull/30/head
Axel Burri 2015-04-20 20:35:13 +02:00
parent a7d3dac64d
commit 2f9055634e
1 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
btrbk
View File

@ -972,27 +972,25 @@ sub btrfs_snapshot($$)
sub btrfs_subvolume_delete($@) sub btrfs_subvolume_delete($@)
{ {
my $config = shift; my $targets = shift // die;
my @targets = @_; my %opts = @_;
return 0 unless(scalar(@targets)); my $commit = $opts{commit};
my @real_targets; die if($commit && ($commit ne "after") && ($commit ne "each"));
my $rsh; $targets = [ $targets ] unless(ref($targets));
foreach (@targets) { return 0 unless(scalar(@$targets));
my ($r, $t) = get_rsh($_, $config); my $rsh = $targets->[0]->{RSH} || "";
die if($rsh && ($rsh ne $r)); # make sure all targets share same ssh host foreach (@$targets) {
$rsh = $r; # make sure all targets share same RSH
push(@real_targets, $t); my $rsh_check = $_->{RSH} || "";
die if($rsh ne $rsh_check);
} }
die if(scalar(@targets) != scalar(@real_targets)); DEBUG "[btrfs] delete" . ($commit ? " (commit-$commit):" : ":");
my $commit_delete = config_key($config, "btrfs_commit_delete") // ""; DEBUG "[btrfs] subvolume: $_->{PRINT}" foreach(@$targets);
DEBUG "[btrfs] delete" . ($commit_delete ? " (commit-$commit_delete):" : ":");
DEBUG "[btrfs] subvolume: $_" foreach(@targets);
my $options = ""; my $options = "";
$options = "--commit-after " if($commit_delete eq "after"); $options = "--commit-$commit " if($commit);
$options = "--commit-each " if($commit_delete eq "each"); my $ret = run_cmd("$rsh /sbin/btrfs subvolume delete $options" . join(' ', map( { $_->{PATH} } @$targets)));
my $ret = run_cmd("$rsh /sbin/btrfs subvolume delete $options" . join(' ', @real_targets)); ERROR "Failed to delete btrfs subvolumes: " . join(' ', map( { $_->{URL} } @$targets)) unless(defined($ret));
ERROR "Failed to delete btrfs subvolumes: " . join(' ', @targets) unless(defined($ret)); return defined($ret) ? scalar(@$targets) : undef;
return defined($ret) ? scalar(@targets) : undef;
} }
@ -1971,12 +1969,14 @@ MAIN:
# #
# delete backups # delete backups
# #
INFO "Cleaning backups of subvolume \"$svol->{URL}\": $droot->{URL}/$snapshot_basename.*"; INFO "Cleaning backups of subvolume \"$svol->{PRINT}\": $droot->{PRINT}/$snapshot_basename.*";
my @schedule; my @schedule;
foreach my $vol (keys %{$droot->{SUBVOL_INFO}}) { foreach my $vol (values %{$droot->{SUBVOL_INFO}}) {
my ($date, $date_ext) = get_date_tag($vol); #!!! TODO: check received_from
next unless($date && ($vol =~ /^\Q$svol.\E/)); next unless($vol->{SUBVOL_PATH} =~ /^\Q$snapshot_basename.\E/);
push(@schedule, { value => "$droot->{URL}/$vol", name => $vol, date => $date, date_ext => $date_ext }); my ($date, $date_ext) = get_date_tag($vol->{NAME});
next unless($date);
push(@schedule, { value => $vol, name => $vol->{PRINT}, date => $date, date_ext => $date_ext });
} }
my (undef, $delete) = schedule( my (undef, $delete) = schedule(
schedule => \@schedule, schedule => \@schedule,
@ -1987,7 +1987,7 @@ MAIN:
preserve_monthly => config_key($config_target, "target_preserve_monthly"), preserve_monthly => config_key($config_target, "target_preserve_monthly"),
log_verbose => 1, log_verbose => 1,
); );
my $ret = btrfs_subvolume_delete($config_target, @$delete); my $ret = btrfs_subvolume_delete($delete, commit => config_key($config_target, "btrfs_commit_delete"));
if(defined($ret)) { if(defined($ret)) {
INFO "Deleted $ret subvolumes in: $droot->{URL}/$snapshot_basename.*"; INFO "Deleted $ret subvolumes in: $droot->{URL}/$snapshot_basename.*";
$config_target->{SUBVOL_DELETED} = $delete; $config_target->{SUBVOL_DELETED} = $delete;
@ -2007,10 +2007,12 @@ MAIN:
} }
INFO "Cleaning snapshots: $sroot->{URL}/$snapdir/$snapshot_basename.*"; INFO "Cleaning snapshots: $sroot->{URL}/$snapdir/$snapshot_basename.*";
my @schedule; my @schedule;
foreach my $vol (keys %{$sroot->{SUBVOL_INFO}}) { foreach my $vol (values %{$sroot->{SUBVOL_INFO}}) {
my ($date, $date_ext) = get_date_tag($vol); # !!! TODO: skip symlinks
next unless($date && ($vol =~ /^\Q$snapdir\/$snapshot_basename.\E/)); next unless($vol->{SUBVOL_PATH} =~ /^\Q$snapdir\/$snapshot_basename.\E/);
push(@schedule, { value => "$sroot->{URL}/$vol", name => $vol, date => $date, date_ext => $date_ext }); my ($date, $date_ext) = get_date_tag($vol->{NAME});
next unless($date);
push(@schedule, { value => $vol, name => $vol->{PRINT}, date => $date, date_ext => $date_ext });
} }
my (undef, $delete) = schedule( my (undef, $delete) = schedule(
schedule => \@schedule, schedule => \@schedule,
@ -2021,7 +2023,7 @@ MAIN:
preserve_monthly => config_key($config_subvol, "snapshot_preserve_monthly"), preserve_monthly => config_key($config_subvol, "snapshot_preserve_monthly"),
log_verbose => 1, log_verbose => 1,
); );
my $ret = btrfs_subvolume_delete($config_subvol, @$delete); my $ret = btrfs_subvolume_delete($delete, commit => config_key($config_subvol, "btrfs_commit_delete"));
if(defined($ret)) { if(defined($ret)) {
INFO "Deleted $ret subvolumes in: $sroot->{URL}/$snapdir/$snapshot_basename.*"; INFO "Deleted $ret subvolumes in: $sroot->{URL}/$snapdir/$snapshot_basename.*";
$config_subvol->{SUBVOL_DELETED} = $delete; $config_subvol->{SUBVOL_DELETED} = $delete;
@ -2060,7 +2062,7 @@ MAIN:
} }
push @out, "+++ $config_subvol->{SNAPSHOT}->{PRINT}" if($config_subvol->{SNAPSHOT}); push @out, "+++ $config_subvol->{SNAPSHOT}->{PRINT}" if($config_subvol->{SNAPSHOT});
if($config_subvol->{SUBVOL_DELETED}) { if($config_subvol->{SUBVOL_DELETED}) {
push @out, "--- $_" foreach(sort { $b cmp $a} @{$config_subvol->{SUBVOL_DELETED}}); push @out, "--- $_->{PRINT}" foreach(sort { $b->{PATH} cmp $a->{PATH} } @{$config_subvol->{SUBVOL_DELETED}});
} }
foreach my $config_target (@{$config_subvol->{TARGET}}) foreach my $config_target (@{$config_subvol->{TARGET}})
{ {
@ -2074,7 +2076,7 @@ MAIN:
} }
if($config_target->{SUBVOL_DELETED}) { if($config_target->{SUBVOL_DELETED}) {
push @out, "--- $_" foreach(sort { $b cmp $a} @{$config_target->{SUBVOL_DELETED}}); push @out, "--- $_->{PRINT}" foreach(sort { $b->{PATH} cmp $a->{PATH} } @{$config_target->{SUBVOL_DELETED}});
} }
if($config_target->{ABORTED}) { if($config_target->{ABORTED}) {