public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH container 2/3] migrate: also test unused volumes
Date: Fri, 18 Jun 2021 12:59:31 +0200	[thread overview]
Message-ID: <20210618105938.57107-3-f.ebner@proxmox.com> (raw)
In-Reply-To: <20210618105938.57107-1-f.ebner@proxmox.com>

otherwise an unused volume on a disabled storage is silently left on the old
node, even if referenced.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---

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





  parent reply	other threads:[~2021-06-18 10:59 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-18 10:59 [pve-devel] [PATCH-SERIES] stricter storage rules for migration Fabian Ebner
2021-06-18 10:59 ` [pve-devel] [PATCH container 1/3] prefer storage_check_enabled over storage_check_node Fabian Ebner
2021-06-21  8:42   ` [pve-devel] applied: " Thomas Lamprecht
2021-06-18 10:59 ` Fabian Ebner [this message]
2021-06-21  8:42   ` [pve-devel] applied: [PATCH container 2/3] migrate: also test unused volumes Thomas Lamprecht
2021-06-18 10:59 ` [pve-devel] [PATCH container 3/3] migrate: enforce that rootdir content type is available Fabian Ebner
2021-06-21  8:42   ` [pve-devel] applied: " Thomas Lamprecht
2021-06-18 10:59 ` [pve-devel] [PATCH qemu-server 1/2] prefer storage_check_enabled over storage_check_node Fabian Ebner
2021-06-21  9:18   ` [pve-devel] applied: " Thomas Lamprecht
2021-06-18 10:59 ` [pve-devel] [PATCH qemu-server 2/2] migrate: enforce that image content type is available Fabian Ebner
2021-06-21  9:18   ` [pve-devel] applied: " Thomas Lamprecht
2021-06-18 10:59 ` [pve-devel] [PATCH storage 1/2] vdisk_list: only scan storages with the correct content type(s) Fabian Ebner
2021-06-21  9:22   ` [pve-devel] applied: " Thomas Lamprecht
2021-06-18 10:59 ` [pve-devel] [PATCH storage 2/2] config: prevent empty content list when content type 'none' is not supported Fabian Ebner
2021-06-21  9:22   ` [pve-devel] applied: " Thomas Lamprecht
2021-06-18 10:59 ` [pve-devel] [PATCH manager 1/2] pve6to7: add check for guest images on misconfigured storages Fabian Ebner
2021-06-21  9:25   ` Thomas Lamprecht
2021-06-18 10:59 ` [pve-devel] [PATCH manager 2/2] pve6to7: check for misconfigured content type 'none' Fabian Ebner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210618105938.57107-3-f.ebner@proxmox.com \
    --to=f.ebner@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal