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

btrbk: do not clean subvolume if any target has previous errors

pull/30/head
Axel Burri 2015-01-16 17:41:57 +01:00
parent 6793f81d50
commit 40d64c9495
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
btrbk
View File

@ -1242,9 +1242,13 @@ MAIN:
next if($config_subvol->{ABORTED}); next if($config_subvol->{ABORTED});
my $svol = $config_subvol->{svol} || die; my $svol = $config_subvol->{svol} || die;
my $snapdir = config_key($config_subvol, "snapshot_dir") || ""; my $snapdir = config_key($config_subvol, "snapshot_dir") || "";
my $target_aborted = 0;
foreach my $config_target (@{$config_subvol->{TARGET}}) foreach my $config_target (@{$config_subvol->{TARGET}})
{ {
next if($config_target->{ABORTED}); if($config_target->{ABORTED}) {
$target_aborted = 1;
next;
}
my $droot = $config_target->{droot} || die; my $droot = $config_target->{droot} || die;
# #
@ -1272,6 +1276,7 @@ MAIN:
} }
else { else {
$config_target->{ABORTED} = "btrfs subvolume delete command failed"; $config_target->{ABORTED} = "btrfs subvolume delete command failed";
$target_aborted = 1;
} }
$config_target->{schedule} = \@schedule; $config_target->{schedule} = \@schedule;
} }
@ -1279,7 +1284,10 @@ MAIN:
# #
# delete snapshots # delete snapshots
# #
# TODO: don't delete any snapshots if on of the above failed if($target_aborted) {
WARN "Skipping cleanup of snapshots for subvolume \"$sroot/$svol\", as at least one target aborted earlier";
next;
}
INFO "Cleaning snapshots: $sroot/$snapdir$svol.*"; INFO "Cleaning snapshots: $sroot/$snapdir$svol.*";
my @schedule; my @schedule;
foreach my $vol (keys %{$vol_info{$sroot}}) { foreach my $vol (keys %{$vol_info{$sroot}}) {
@ -1361,6 +1369,9 @@ MAIN:
print "\nNOTE: Some errors occurred, which may result in missing backups!\n"; print "\nNOTE: Some errors occurred, which may result in missing backups!\n";
print "Please check warning and error messages above.\n"; print "Please check warning and error messages above.\n";
} }
if($dryrun) {
print "\nNOTE: Dryrun was active, none of the operations below were actually executed!\n";
}
} }
} }
} }