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 06A74694E0 for ; Mon, 22 Mar 2021 15:33:21 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F19892581B for ; Mon, 22 Mar 2021 15:32:50 +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 EBC44257FB for ; Mon, 22 Mar 2021 15:32:49 +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 B0B1B426D2 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:42 +0100 Message-Id: <20210322143243.6606-3-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 container 3/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:33:21 -0000 except for migration, where it would be subtly backwards-incompatible. Also allows to get rid of the existing filtering hack in rescan(). Signed-off-by: Fabian Ebner --- Dependency bump for pve-storage is needed. src/PVE/LXC.pm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index 6395d12..7e6f378 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -836,7 +836,7 @@ sub destroy_lxc_container { }); if ($purge_unreferenced) { # also remove unreferenced disk - my $vmdisks = PVE::Storage::vdisk_list($storage_cfg, undef, $vmid); + my $vmdisks = PVE::Storage::vdisk_list($storage_cfg, undef, $vmid, undef, 'rootdir'); PVE::Storage::foreach_volid($vmdisks, sub { my ($volid, $sid, $volname, $d) = @_; eval { PVE::Storage::vdisk_free($storage_cfg, $volid) }; @@ -2042,7 +2042,7 @@ sub update_unused { sub scan_volids { my ($cfg, $vmid) = @_; - my $info = PVE::Storage::vdisk_list($cfg, undef, $vmid); + my $info = PVE::Storage::vdisk_list($cfg, undef, $vmid, undef, 'rootdir'); my $all_volumes = {}; foreach my $storeid (keys %$info) { @@ -2062,12 +2062,6 @@ 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}->{rootdir}; - } - print "rescan volumes...\n"; my $all_volumes = scan_volids($cfg, $vmid); -- 2.20.1