proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-04 19:32:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Always use prune-backups instead of maxfiles internally

Browse Source 
For the use case with '--dumpdir', it's not possible to call prune_backups
directly, so a little bit of special handling is required there.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner 2020-09-29 10:37:05 +02:00 committed by Thomas Lamprecht
parent e6946086e3
commit f354fe47fc
1 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
PVE/VZDump.pm
View File

@ -484,8 +484,10 @@ sub new {
die "internal error";
}
if (!defined($opts->{'prune-backups'}) && !defined($opts->{maxfiles})) {
$opts->{maxfiles} = $defaults->{maxfiles};
if (!defined($opts->{'prune-backups'})) {
$opts->{maxfiles} //= $defaults->{maxfiles};
$opts->{'prune-backups'} = { 'keep-last' => $opts->{maxfiles} };
delete $opts->{maxfiles};
}
if ($opts->{tmpdir} && ! -d $opts->{tmpdir}) {
@ -720,17 +722,12 @@ sub exec_backup_task {
my $bkname = "vzdump-$vmtype-$vmid";
my $basename = $bkname . strftime("-%Y_%m_%d-%H_%M_%S", localtime($task->{backup_time}));
my $maxfiles = $opts->{maxfiles};
my $prune_options = $opts->{'prune-backups'};
my $backup_limit = 0;
if (defined($maxfiles)) {
$backup_limit = $maxfiles;
} elsif (defined($prune_options)) {
foreach my $keep (values %{$prune_options}) {
$backup_limit += $keep;
}
}
if ($backup_limit && !$opts->{remove}) {
my $count;
@ -952,25 +949,18 @@ sub exec_backup_task {
# purge older backup
if ($opts->{remove}) {
if ($maxfiles) {
if ($self->{opts}->{pbs}) {
my $args = [$pbs_group_name, '--quiet', '1', '--keep-last', $maxfiles];
my $logfunc = sub { my $line = shift; debugmsg ('info', $line, $logfd); };
PVE::Storage::PBSPlugin::run_raw_client_cmd(
$opts->{scfg}, $opts->{storage}, 'prune', $args, logfunc => $logfunc);
} else {
if (!defined($opts->{storage})) {
my $bklist = get_backup_file_list($opts->{dumpdir}, $bkname, $task->{target});
$bklist = [ sort { $b->{ctime} <=> $a->{ctime} } @$bklist ];
PVE::Storage::prune_mark_backup_group($bklist, $prune_options);
while (scalar (@$bklist) >= $maxfiles) {
my $d = pop @$bklist;
my $archive_path = $d->{path};
foreach my $prune_entry (@{$bklist}) {
next if $prune_entry->{mark} ne 'remove';
my $archive_path = $prune_entry->{path};
debugmsg ('info', "delete old backup '$archive_path'", $logfd);
PVE::Storage::archive_remove($archive_path);
}
}
} elsif (defined($prune_options)) {
} else {
my $logfunc = sub { debugmsg($_[0], $_[1], $logfd) };
PVE::Storage::prune_backups($cfg, $opts->{storage}, $prune_options, $vmid, $vmtype, 0, $logfunc);
}