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 77D9B7DABB for ; Tue, 9 Nov 2021 13:44:51 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 613B0D6FF for ; Tue, 9 Nov 2021 13:44:21 +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 id 82F28D6F3 for ; Tue, 9 Nov 2021 13:44:20 +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 5101042326 for ; Tue, 9 Nov 2021 13:44:20 +0100 (CET) Date: Tue, 09 Nov 2021 13:44:13 +0100 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Fabian Ebner , pve-devel@lists.proxmox.com References: <20211105130359.40803-1-f.gruenbichler@proxmox.com> <20211105130359.40803-17-f.gruenbichler@proxmox.com> In-Reply-To: MIME-Version: 1.0 User-Agent: astroid/0.15.0 (https://github.com/astroidmail/astroid) Message-Id: <1636461801.r9tpxgsubv.astroid@nora.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.291 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. [qemuserver.pm, qemumigrate.pm] Subject: Re: [pve-devel] [PATCH qemu-server 04/10] refactor map_storage to map_id 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, 09 Nov 2021 12:44:51 -0000 On November 9, 2021 10:06 am, Fabian Ebner wrote: > I feel like map_id should be moved to pve-common, so that it can be=20 > re-used in other places (pve-container will need it too), and so that no=20 > package boundary needs to be crossed if we ever need to adapt the=20 > internals of the idmap. yeah, likely some other parts as well (either to guest-common, common or=20 storage, once we extend this mechanism to cover ZFS replication and=20 container migration) >=20 > Am 05.11.21 um 14:03 schrieb Fabian Gr=C3=BCnbichler: >> since we are going to reuse the same mechanism/code for network bridge >> mapping. >>=20 >> Signed-off-by: Fabian Gr=C3=BCnbichler >> --- >> PVE/QemuMigrate.pm | 6 +++--- >> PVE/QemuServer.pm | 6 ++++-- >> 2 files changed, 7 insertions(+), 5 deletions(-) >>=20 >> diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm >> index ae3eaf1..779f5ee 100644 >> --- a/PVE/QemuMigrate.pm >> +++ b/PVE/QemuMigrate.pm >> @@ -342,7 +342,7 @@ sub prepare { >> my $targetsid =3D $sid; >> # NOTE: we currently ignore shared source storages in mappings so ski= p here too for now >> if (!$scfg->{shared}) { >> - $targetsid =3D PVE::QemuServer::map_storage($self->{opts}->{storag= emap}, $sid); >> + $targetsid =3D PVE::QemuServer::map_id($self->{opts}->{storagemap}= , $sid); >> } >> =20 >> my $target_scfg =3D PVE::Storage::storage_check_enabled($storecfg, $t= argetsid, $self->{node}); >> @@ -408,7 +408,7 @@ sub scan_local_volumes { >> =20 >> next if @{$dl->{$storeid}} =3D=3D 0; >> =20 >> - my $targetsid =3D PVE::QemuServer::map_storage($self->{opts}->{sto= ragemap}, $storeid); >> + my $targetsid =3D PVE::QemuServer::map_id($self->{opts}->{storagem= ap}, $storeid); >> # check if storage is available on target node >> my $target_scfg =3D PVE::Storage::storage_check_enabled( >> $storecfg, >> @@ -479,7 +479,7 @@ sub scan_local_volumes { >> my $targetsid =3D $sid; >> # NOTE: we currently ignore shared source storages in mappings so= skip here too for now >> if (!$scfg->{shared}) { >> - $targetsid =3D PVE::QemuServer::map_storage($self->{opts}->{storagema= p}, $sid); >> + $targetsid =3D PVE::QemuServer::map_id($self->{opts}->{storagemap}, $= sid); >> } >> =20 >> PVE::Storage::storage_check_enabled($storecfg, $targetsid, $self-= >{node}); >> diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm >> index a0e1809..23e7b08 100644 >> --- a/PVE/QemuServer.pm >> +++ b/PVE/QemuServer.pm >> @@ -120,7 +120,9 @@ PVE::JSONSchema::register_standard_option('pve-qemu-= machine', { >> }); >> =20 >> =20 >> -sub map_storage { >> +# maps source to target ID >> +# currently used for targetstorage and targetbridge when migrating >> +sub map_id { >> my ($map, $source) =3D @_; >> =20 >> return $source if !defined($map); >> @@ -5264,7 +5266,7 @@ sub vm_migrate_alloc_nbd_disks { >> # volume is not available there, fall back to the default format. >> # Otherwise use the same format as the original. >> if (!$storagemap->{identity}) { >> - $storeid =3D map_storage($storagemap, $storeid); >> + $storeid =3D map_id($storagemap, $storeid); >> my ($defFormat, $validFormats) =3D PVE::Storage::storage_default_= format($storecfg, $storeid); >> my $scfg =3D PVE::Storage::storage_config($storecfg, $storeid); >> my $fileFormat =3D qemu_img_format($scfg, $volname); >>=20 >=20