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 EBFAD737A8 for ; Fri, 18 Jun 2021 12:59:44 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BE88C26B4E for ; Fri, 18 Jun 2021 12:59:44 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 A3D6726B70 for ; Fri, 18 Jun 2021 12:59:42 +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 6435C4422B for ; Fri, 18 Jun 2021 12:59:42 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 18 Jun 2021 12:59:31 +0200 Message-Id: <20210618105938.57107-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210618105938.57107-1-f.ebner@proxmox.com> References: <20210618105938.57107-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.742 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [migrate.pm] Subject: [pve-devel] [PATCH container 2/3] migrate: also test unused volumes 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: Fri, 18 Jun 2021 10:59:45 -0000 otherwise an unused volume on a disabled storage is silently left on the old node, even if referenced. Signed-off-by: Fabian Ebner --- needs the previous patch to work correctly (otherwise disable is still ignored) src/PVE/LXC/Migrate.pm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/PVE/LXC/Migrate.pm b/src/PVE/LXC/Migrate.pm index 95c5799..1e5cb1e 100644 --- a/src/PVE/LXC/Migrate.pm +++ b/src/PVE/LXC/Migrate.pm @@ -44,7 +44,7 @@ sub prepare { } $self->{was_running} = $running; - PVE::LXC::Config->foreach_volume($conf, sub { + PVE::LXC::Config->foreach_volume_full($conf, { include_unused => 1 }, sub { my ($ms, $mountpoint) = @_; my $volid = $mountpoint->{volume}; @@ -186,7 +186,7 @@ sub phase1 { next if $scfg->{shared}; next if !PVE::Storage::storage_check_enabled($self->{storecfg}, $storeid, undef, 1); - # get list from PVE::Storage (for unused volumes) + # get list from PVE::Storage (for unreferenced volumes) my $dl = PVE::Storage::vdisk_list($self->{storecfg}, $storeid, $vmid); next if @{$dl->{$storeid}} == 0; @@ -208,9 +208,8 @@ sub phase1 { PVE::LXC::Config->foreach_volume($conf->{snapshots}->{$snapname}, $test_mp, $snapname); } - # finally all currently used volumes - PVE::LXC::Config->foreach_volume($conf, $test_mp); - + # finally all current volumes + PVE::LXC::Config->foreach_volume_full($conf, { include_unused => 1 }, $test_mp); # additional checks for local storage foreach my $volid (keys %$volhash) { -- 2.30.2