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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 6FAEC60CF9 for ; Mon, 19 Oct 2020 16:11:40 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 605022D92A for ; Mon, 19 Oct 2020 16:11:40 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 4F5312D91F for ; Mon, 19 Oct 2020 16:11:39 +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 1C6F745E11 for ; Mon, 19 Oct 2020 16:11:39 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Mon, 19 Oct 2020 16:11:38 +0200 Message-Id: <20201019141138.13875-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.497 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 Subject: [pve-devel] [PATCH qemu-server] partially fix #3056: try to cancel backup without uuid 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: Mon, 19 Oct 2020 14:11:40 -0000 if the 'backup' qmp call itself times out or fails, we still want to try to cancel the backup, else it can happen that there is still a backup running even when vzdump thinks it was canceled qapi docs says that backup cancel always returns success, even if no backup is running since we hold a global and a per vm lock for the backup, this should be ok, since we should not reach this code without that lock Signed-off-by: Dominik Csapak --- PVE/VZDump/QemuServer.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PVE/VZDump/QemuServer.pm b/PVE/VZDump/QemuServer.pm index c8094bd..8792e76 100644 --- a/PVE/VZDump/QemuServer.pm +++ b/PVE/VZDump/QemuServer.pm @@ -577,7 +577,7 @@ sub archive_pbs { my $err = $@; if ($err) { $self->logerr($err); - $self->mon_backup_cancel($vmid) if defined($backup_job_uuid); + $self->mon_backup_cancel($vmid); } $self->restore_vm_power_state($vmid); @@ -754,7 +754,7 @@ sub archive_vma { my $err = $@; if ($err) { $self->logerr($err); - $self->mon_backup_cancel($vmid) if defined($backup_job_uuid); + $self->mon_backup_cancel($vmid); } $self->restore_vm_power_state($vmid); -- 2.20.1