From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id D3BB31FF16E for <inbox@lore.proxmox.com>; Mon, 14 Apr 2025 13:59:57 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 784E5318E7; Mon, 14 Apr 2025 13:59:56 +0200 (CEST) From: Wolfgang Bumiller <w.bumiller@proxmox.com> To: pve-devel@lists.proxmox.com Date: Mon, 14 Apr 2025 13:59:53 +0200 Message-Id: <20250414115953.52617-1-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.080 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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] fix #6317: backup: use correct cleanup_fleecing_images helper X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> The local one is specific for `allocate_fleecing_images` and has a comment stating to use the one from `PVE::QemuConfig` in all other cases. The `cleanup` sub already called this, but only if the VM was running. We do allocate fleecing images for previously-stopped VMs as well, though, so we also need to do the cleanup. As for the `detach_fleecing_images()` call: while could have stayed in the `vm_running_locall()` branch, it also performs this check and this way the entire fleecing cleanup stays together in one place. Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com> --- PVE/VZDump/QemuServer.pm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/PVE/VZDump/QemuServer.pm b/PVE/VZDump/QemuServer.pm index 4860798e..10514f75 100644 --- a/PVE/VZDump/QemuServer.pm +++ b/PVE/VZDump/QemuServer.pm @@ -1267,15 +1267,17 @@ sub cleanup { } $detach_tpmstate_drive->($task, $vmid); - if ($task->{'use-fleecing'}) { + } + + if ($task->{'use-fleecing'}) { + eval { detach_fleecing_images($task->{disks}, $vmid); PVE::QemuConfig::cleanup_fleecing_images( $vmid, $self->{storecfg}, sub { $self->log($_[0], $_[1]); }); - } + }; + $self->log('warn', "attempt to clean up fleecing images failed - $@") if $@; } - cleanup_fleecing_images($self, $task->{disks}) if $task->{'use-fleecing'}; - if ($self->{qmeventd_fh}) { close($self->{qmeventd_fh}); } -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel