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 DEF787343B for ; Thu, 15 Apr 2021 12:11:35 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C90DA18821 for ; Thu, 15 Apr 2021 12:11:05 +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 5C86C18818 for ; Thu, 15 Apr 2021 12:11:02 +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 2CBD945A0F for ; Thu, 15 Apr 2021 12:11:02 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 15 Apr 2021 12:10:57 +0200 Message-Id: <20210415101057.2836-1-f.ebner@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.007 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. [drive.pm] Subject: [pve-devel] [PATCH qemu-server] drive: volume in-use check: fix fallback path comparison 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, 15 Apr 2021 10:11:35 -0000 When checking whether a volume is still referenced by a snapshot, the volid itself is first checked. When the volid is different, we fall back to comparing the path. As the first value to be compared is a volume's path, the second value better be a volume's path too, and not a snapshot's path. See also 77019edfe0c190c949cdc0b0e3b4ad2ca37313b3 for historical context. The error that led me here: * had a VM with ZFS over iSCSI storage with an exsiting snapshot * add new unused drive * try to remove the unsued drive * fails, because ZFS (not Pool!) Plugin does not support snapshot paths. Signed-off-by: Fabian Ebner --- PVE/QemuServer/Drive.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PVE/QemuServer/Drive.pm b/PVE/QemuServer/Drive.pm index 01ea8d7..9016a43 100644 --- a/PVE/QemuServer/Drive.pm +++ b/PVE/QemuServer/Drive.pm @@ -590,7 +590,7 @@ sub is_volume_in_use { next if !$storeid; my $scfg = PVE::Storage::storage_config($storecfg, $storeid, 1); next if !$scfg; - return 1 if $path eq PVE::Storage::path($storecfg, $drive->{file}, $snapname); + return 1 if $path eq PVE::Storage::path($storecfg, $drive->{file}); } } } -- 2.20.1