Proxmox/pve-manager
5
0
Fork 0
Code Pull Requests Releases Activity

only use plugin after truthiness check

Browse Source 
Commit 1a87db9e56 introduced
a usage of plugin before the truthiness check for plugin.

At the moment it might not be possible to trigger this anymore,
because of the guest inclusion rework that happened later on.
But to make tasks for inexistent guest IDs visibly fail again,
this check will be necessary. Also, to get the error message in
the mail, it needs to fail inside the eval block.

Thus, keep the check in the eval block and move the block of code
using the plugin to below the check.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner 2020-10-22 12:30:12 +02:00 committed by Thomas Lamprecht
parent 83b2191464
commit d51f5a1e8d
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
PVE/VZDump.pm
View File

@ -672,25 +672,12 @@ sub exec_backup_task {
my $cfg = PVE::Storage::config();
my $vmid = $task->{vmid};
my $plugin = $task->{plugin};
my $vmtype = $plugin->type();
$task->{backup_time} = time();
my $pbs_group_name;
my $pbs_snapshot_name;
if ($self->{opts}->{pbs}) {
if ($vmtype eq 'lxc') {
$pbs_group_name = "ct/$vmid";
} elsif ($vmtype eq 'qemu') {
$pbs_group_name = "vm/$vmid";
} else {
die "pbs backup not implemented for plugin type '$vmtype'\n";
}
my $btime = strftime("%FT%TZ", gmtime($task->{backup_time}));
$pbs_snapshot_name = "$pbs_group_name/$btime";
}
my $vmstarttime = time ();
my $logfd;
@ -708,6 +695,20 @@ sub exec_backup_task {
eval {
die "unable to find VM '$vmid'\n" if !$plugin;
my $vmtype = $plugin->type();
if ($self->{opts}->{pbs}) {
if ($vmtype eq 'lxc') {
$pbs_group_name = "ct/$vmid";
} elsif ($vmtype eq 'qemu') {
$pbs_group_name = "vm/$vmid";
} else {
die "pbs backup not implemented for plugin type '$vmtype'\n";
}
my $btime = strftime("%FT%TZ", gmtime($task->{backup_time}));
$pbs_snapshot_name = "$pbs_group_name/$btime";
}
# for now we deny backups of a running ha managed service in *stop* mode
# as it interferes with the HA stack (started services should not stop).
if ($opts->{mode} eq 'stop' &&