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

archive info: keep some basic strictness

Browse Source 
we want to enforce at least the strictness that our tools can do
something with a backup archive..

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2020-05-15 19:18:22 +02:00
parent bf5af0fbf5
commit 5029f978c3
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
PVE/Storage.pm
View File

@ -1394,13 +1394,9 @@ sub archive_info {
my $info; my $info;
my $volid = basename($archive); my $volid = basename($archive);
if ($volid =~ /\.(tgz$|tar|vma)(?:\.(${\PVE::Storage::Plugin::COMPRESSOR_RE}))?$/) { if ($volid =~ /vzdump-(lxc|openvz|qemu)-\d+-.+\.(tgz$|tar|vma)(?:\.(${\PVE::Storage::Plugin::COMPRESSOR_RE}))?$/) {
$info = decompressor_info($1, $2); $info = decompressor_info($2, $3);
$info->{type} = 'unknown';
if ($volid =~ /vzdump-(lxc|openvz|qemu)-\d+-(?:\d{4})_(?:\d{2})_(?:\d{2})-(?:\d{2})_(?:\d{2})_(?:\d{2})/) {
$info->{type} = $1; $info->{type} = $1;
}
} else { } else {
die "ERROR: couldn't determine archive info from '$archive'\n"; die "ERROR: couldn't determine archive info from '$archive'\n";
} }

4
test/archive_info_test.pm
View File

@ -40,9 +40,9 @@ my $tests = [
}, },
{ {
description => 'Backup archive, none, tgz', description => 'Backup archive, none, tgz',
archive => "backup/whatever-the-name_is_here.tgz", archive => "backup/vzdump-qemu-$vmid-whatever-the-name_is_here.tgz",
expected => { expected => {
'type' => 'unknown', 'type' => 'qemu',
'format' => 'tar', 'format' => 'tar',
'decompressor' => ['tar', '-z'], 'decompressor' => ['tar', '-z'],
'compression' => 'gz', 'compression' => 'gz',