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 7E19EBBC58 for ; Tue, 19 Dec 2023 12:38:10 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4E93636DB6 for ; Tue, 19 Dec 2023 12:37:40 +0100 (CET) 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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 19 Dec 2023 12:37:39 +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 1C9A548585 for ; Tue, 19 Dec 2023 12:37:39 +0100 (CET) Date: Tue, 19 Dec 2023 12:37:32 +0100 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20231219104337.100411-1-h.duerr@proxmox.com> <20231219104337.100411-2-h.duerr@proxmox.com> In-Reply-To: <20231219104337.100411-2-h.duerr@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1702985173.wwf0cwrukx.astroid@yuna.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.064 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com, qemumigrate.pm] Subject: Re: [pve-devel] [PATCH qemu-server v3 1/2] migration: secure and use source volume names for deactivation 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, 19 Dec 2023 11:38:10 -0000 On December 19, 2023 11:43 am, Hannes Duerr wrote: > During migration, the volume names may change if the name is already in > use at the target location. We therefore want to save the original names > before the migration so that we can deactivate the original volumes > afterwards. we already do that though, no need for a new key in $self ;) >=20 > Signed-off-by: Hannes Duerr > --- > PVE/QemuMigrate.pm | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) >=20 > diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm > index b87e47a..ec4710d 100644 > --- a/PVE/QemuMigrate.pm > +++ b/PVE/QemuMigrate.pm > @@ -744,6 +744,11 @@ sub phase1 { > $conf->{lock} =3D 'migrate'; > PVE::QemuConfig->write_config($vmid, $conf); > =20 > + PVE::QemuConfig->foreach_volume($conf, sub { > + my ($ds, $drive) =3D @_; > + push $self->{source_volumes}->@*, $drive->{file}; > + }); > + > $self->scan_local_volumes($vmid); scan_local_volumes already records the local volumes (and shared ones, in case of remote migration), and any mappings. > =20 > # fix disk sizes to match their actual size and write changes, > @@ -1586,8 +1591,7 @@ sub phase3_cleanup { > =20 > # always deactivate volumes - avoid lvm LVs to be active on several = nodes > eval { > - my $vollist =3D PVE::QemuServer::get_vm_volumes($conf); > - PVE::Storage::deactivate_volumes($self->{storecfg}, $vollist); > + PVE::Storage::deactivate_volumes($self->{storecfg}, $self->{source_volu= mes}); one way to approach this here would be to re-use the information from $self->{volume_map} and do a reverse lookup per volid. even easier though would be to just get the vollist higher up in this sub, since the local mapping takes place here as well, and we just need to call get_vm_volumes with $conf before the volume_map replacements. > }; > if (my $err =3D $@) { > $self->log('err', $err); > --=20 > 2.39.2 >=20 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20 >=20 >=20