yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix #3307: make it possible to set protection for backups

Browse Source 
A protected backup is not removed by free_image and ignored when
pruning.

The protection_file_path function is introduced in Storage.pm, so that
it can also be used by vzdump itself and in archive_remove.

For pruning, renamed backups already behaved similiar to how protected
backups will, but there are a few reasons to not just use that for
implementing the new feature:
1. It wouldn't protect against removal.
2. It would make it necessary to rename notes and log files too.
3. It wouldn't naturally extend to other volumes if that's needed.

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

37
PVE/API2/Storage/Content.pm
View File

@ -113,6 +113,11 @@ __PACKAGE__->register_method ({
},
optional => 1,
},
protected => {
description => "Protection status. Currently only supported for backups.",
type => 'boolean',
optional => 1,
},
},
},
links => [ { rel => 'child', href => "{volid}" } ],
@ -295,7 +300,12 @@ __PACKAGE__->register_method ({
description => "Optional notes.",
optional => 1,
type => 'string',
}
},
protected => {
description => "Protection status. Currently only supported for backups.",
type => 'boolean',
optional => 1,
},
},
},
code => sub {
@ -321,12 +331,14 @@ __PACKAGE__->register_method ({
format => $format,
};
# keep going if fetching an optional attribute fails
eval {
my $notes = PVE::Storage::get_volume_attribute($cfg, $volid, 'notes');
$entry->{notes} = $notes if defined($notes);
};
warn $@ if $@;
for my $attribute (qw(notes protected)) {
# keep going if fetching an optional attribute fails
eval {
my $value = PVE::Storage::get_volume_attribute($cfg, $volid, $attribute);
$entry->{$attribute} = $value if defined($value);
};
warn $@ if $@;
}
return $entry;
}});
@ -356,6 +368,11 @@ __PACKAGE__->register_method ({
type => 'string',
optional => 1,
},
protected => {
description => "Protection status. Currently only supported for backups.",
type => 'boolean',
optional => 1,
},
},
},
returns => { type => 'null' },
@ -371,8 +388,10 @@ __PACKAGE__->register_method ({
PVE::Storage::check_volume_access($rpcenv, $authuser, $cfg, undef, $volid);
if (exists $param->{notes}) {
PVE::Storage::update_volume_attribute($cfg, $volid, 'notes', $param->{notes});
for my $attr (qw(notes protected)) {
if (exists $param->{$attr}) {
PVE::Storage::update_volume_attribute($cfg, $volid, $attr, $param->{$attr});
}
}
return undef;