From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 3308761BAD for ; Thu, 22 Oct 2020 12:31:01 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DBD241EFF2 for ; Thu, 22 Oct 2020 12:30:30 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 3E9401EFA7 for ; Thu, 22 Oct 2020 12:30:29 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 00B7045EE4 for ; Thu, 22 Oct 2020 12:30:29 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 22 Oct 2020 12:30:12 +0200 Message-Id: <20201022103017.19715-4-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201022103017.19715-1-f.ebner@proxmox.com> References: <20201022103017.19715-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.039 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [vzdump.pm] Subject: [pve-devel] [PATCH v2 manager 3/8] only use plugin after truthiness check X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Oct 2020 10:31:01 -0000 Commit 62fc2aa9fa2eb82596f98aa014d3b0ccfc0ec542 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 --- PVE/VZDump.pm | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index ee4e68b5..e6082f3b 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -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' && -- 2.20.1