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 DE2309992C for ; Tue, 2 May 2023 15:17:34 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C29363109E for ; Tue, 2 May 2023 15:17:34 +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 for ; Tue, 2 May 2023 15:17:33 +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 5DCBB46DDE for ; Tue, 2 May 2023 15:17:33 +0200 (CEST) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Tue, 2 May 2023 15:17:32 +0200 Message-Id: <20230502131732.1875692-3-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230502131732.1875692-1-a.lauterer@proxmox.com> References: <20230502131732.1875692-1-a.lauterer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.089 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH container 2/2] migration: avoid migrating volume images multiple times 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: Tue, 02 May 2023 13:17:34 -0000 Scan the VM config and store the volid and full path for each storage. Do the same when we scan each storage. Then we can have these scenarios: * multiple storage configurations might point to the same storage The result is, that when scanning the storages, we find the volume multiple times. -> we ignore them * a VM might have multiple volumes configured, pointing to the same volume -> We fail with a warning that two mpX configs point to the same volume Without these checks, it was possible to multiply the number of volumes with each migration (with local disk) if at least another storage was configured, pointing to the same place. Signed-off-by: Aaron Lauterer --- src/PVE/LXC/Migrate.pm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/PVE/LXC/Migrate.pm b/src/PVE/LXC/Migrate.pm index ccf5157..47cb94b 100644 --- a/src/PVE/LXC/Migrate.pm +++ b/src/PVE/LXC/Migrate.pm @@ -256,6 +256,28 @@ sub phase1 { &$log_error($@, $volid) if $@; }; + # store and map already referenced absolute paths and volids + my $referencedpath = {}; # path -> volid + my $referenced = {}; # volid -> config key (e.g. mp0) + + # reference volumes in config first + PVE::LXC::Config->foreach_volume_full($conf, { include_unused => 1 }, sub { + my ($key, $volume) = @_; + my $volid = $volume->{volume}; + my $path = PVE::Storage::path($self->{storecfg}, $volid); + if (defined $referencedpath->{$path}) { + my $rkey = $referenced->{$referencedpath->{$path}}; + &$log_error( + "'$key' and '$rkey' reference the same volume. ". + "(check guest and storage configuration?)\n", + $volid + ); + return; + } + $referencedpath->{$path} = $volid; + $referenced->{$volid} = $key; + }); + # first unused / lost volumes owned by this container my @sids = PVE::Storage::storage_ids($self->{storecfg}); foreach my $storeid (@sids) { @@ -280,6 +302,15 @@ sub phase1 { PVE::Storage::foreach_volid($dl, sub { my ($volid, $sid, $volname) = @_; + # check if volume is already referenced + my $path = PVE::Storage::path($self->{storecfg}, $volid); + if (defined $referencedpath->{$path} && !$referenced->{$volid}) { + $self->log('info', "ignoring '$volid' - already referenced by other storage '$referencedpath->{$path}'\n"); + next; + } + $referencedpath->{$path} = $volid; + $referenced->{$volid} = 1; + $volhash->{$volid}->{ref} = 'storage'; $volhash->{$volid}->{targetsid} = $targetsid; }); -- 2.30.2