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 19DBC6952F for ; Mon, 22 Mar 2021 15:32:51 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 10A4F2581C for ; Mon, 22 Mar 2021 15:32:51 +0100 (CET) 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 09F3B2580C for ; Mon, 22 Mar 2021 15:32:50 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id C5A254630B for ; Mon, 22 Mar 2021 15:32:49 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 22 Mar 2021 15:32:43 +0100 Message-Id: <20210322143243.6606-4-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210322143243.6606-1-f.ebner@proxmox.com> References: <20210322143243.6606-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.005 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 4/4] filter by content type when using vdisk_list 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, 22 Mar 2021 14:32:51 -0000 except for migration, where it would be subtly backwards-incompatible. Since there is a scan_volids call for migration, we can't default to filtering in scan_volids just yet. Also allows to get rid of the existing filtering hack in rescan(). Signed-off-by: Fabian Ebner --- Dependency bump for pve-storage is needed. PVE/QemuServer.pm | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 1c0b5c2..9fa5546 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -2111,7 +2111,7 @@ sub destroy_vm { }); if ($purge_unreferenced) { # also remove unreferenced disk - my $vmdisks = PVE::Storage::vdisk_list($storecfg, undef, $vmid); + my $vmdisks = PVE::Storage::vdisk_list($storecfg, undef, $vmid, undef, 'images'); PVE::Storage::foreach_volid($vmdisks, sub { my ($volid, $sid, $volname, $d) = @_; eval { PVE::Storage::vdisk_free($storecfg, $volid) }; @@ -5998,10 +5998,11 @@ my $restore_destroy_volumes = sub { } }; +# FIXME For PVE 7.0, remove $content_type and always use 'images' sub scan_volids { - my ($cfg, $vmid) = @_; + my ($cfg, $vmid, $content_type) = @_; - my $info = PVE::Storage::vdisk_list($cfg, undef, $vmid); + my $info = PVE::Storage::vdisk_list($cfg, undef, $vmid, undef, $content_type); my $volid_hash = {}; foreach my $storeid (keys %$info) { @@ -6094,14 +6095,8 @@ sub rescan { my $cfg = PVE::Storage::config(); - # FIXME: Remove once our RBD plugin can handle CT and VM on a single storage - # see: https://pve.proxmox.com/pipermail/pve-devel/2018-July/032900.html - foreach my $stor (keys %{$cfg->{ids}}) { - delete($cfg->{ids}->{$stor}) if ! $cfg->{ids}->{$stor}->{content}->{images}; - } - print "rescan volumes...\n"; - my $volid_hash = scan_volids($cfg, $vmid); + my $volid_hash = scan_volids($cfg, $vmid, 'images'); my $updatefn = sub { my ($vmid) = @_; -- 2.20.1