Proxmox/pve-storage
5
0
Fork 0
mirror of git://git.proxmox.com/git/pve-storage.git synced 2025-01-10 01:18:05 +03:00
Code Releases Activity

prune: mark renamed and protected backups differently

Browse Source 
While it makes no difference for pruning itself, protected backups are
additionally protected against removal. Avoid the potential to confuse
the two. Also update the description for the API return value and add
an enum constraint.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner 2021-09-30 13:42:09 +02:00 committed by Fabian Grünbichler
parent 56897a9203
commit ecfe25058b
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PVE/API2/Storage/PruneBackups.pm
View File

@ -61,9 +61,10 @@ __PACKAGE__->register_method ({
type => 'integer',
},
'mark' => {
description => "Whether the backup would be kept or removed. For backups that don't " .
"use the standard naming scheme, it's 'protected'.",
description => "Whether the backup would be kept or removed. Backups that are" .
" protected or don't use the standard naming scheme are not removed.",
type => 'string',
enum => ['keep', 'remove', 'protected', 'renamed'],
},
type => {
description => "One of 'qemu', 'lxc', 'openvz' or 'unknown'.",

2
PVE/Storage/Plugin.pm
View File

@ -1372,7 +1372,7 @@ sub prune_backups {
push @{$backup_groups->{$group}}, $prune_entry;
} else {
# ignore backups that don't use the standard naming scheme
$prune_entry->{mark} = 'protected';
$prune_entry->{mark} = 'renamed';
}
$prune_entry->{mark} = 'protected' if $backup->{protected};

4
test/prune_backups_test.pm
View File

@ -189,7 +189,7 @@ sub generate_expected {
'volid' => "$storeid:backup/vzdump-$vmid-renamed.tar.zst",
'type' => 'unknown',
'ctime' => 1234,
'mark' => 'protected',
'mark' => 'renamed',
'vmid' => $vmid,
},
) if !defined($type);
@ -375,7 +375,7 @@ my $tests = [
{
'volid' => "$storeid:backup/vzdump-lxc-novmid.tar.gz",
'ctime' => 1234,
'mark' => 'protected',
'mark' => 'renamed',
'type' => 'lxc',
},
],