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 7E5407D65F for ; Tue, 9 Nov 2021 10:07:27 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7B4F12F9AA for ; Tue, 9 Nov 2021 10:06:57 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id BE0E62F99F for ; Tue, 9 Nov 2021 10:06:56 +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 9B3F8427CE for ; Tue, 9 Nov 2021 10:06:56 +0100 (CET) To: pve-devel@lists.proxmox.com, =?UTF-8?Q?Fabian_Gr=c3=bcnbichler?= References: <20211105130359.40803-1-f.gruenbichler@proxmox.com> <20211105130359.40803-17-f.gruenbichler@proxmox.com> From: Fabian Ebner Message-ID: Date: Tue, 9 Nov 2021 10:06:50 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: <20211105130359.40803-17-f.gruenbichler@proxmox.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 1.751 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 NICE_REPLY_A -3.06 Looks like a legit reply (A) 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. [qemumigrate.pm, qemuserver.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 09:07:27 -0000 I feel like map_id should be moved to pve-common, so that it can be re-used in other places (pve-container will need it too), and so that no package boundary needs to be crossed if we ever need to adapt the internals of the idmap. Am 05.11.21 um 14:03 schrieb Fabian Grünbichler: > since we are going to reuse the same mechanism/code for network bridge > mapping. > > Signed-off-by: Fabian Grünbichler > --- > PVE/QemuMigrate.pm | 6 +++--- > PVE/QemuServer.pm | 6 ++++-- > 2 files changed, 7 insertions(+), 5 deletions(-) > > 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 = $sid; > # NOTE: we currently ignore shared source storages in mappings so skip here too for now > if (!$scfg->{shared}) { > - $targetsid = PVE::QemuServer::map_storage($self->{opts}->{storagemap}, $sid); > + $targetsid = PVE::QemuServer::map_id($self->{opts}->{storagemap}, $sid); > } > > my $target_scfg = PVE::Storage::storage_check_enabled($storecfg, $targetsid, $self->{node}); > @@ -408,7 +408,7 @@ sub scan_local_volumes { > > next if @{$dl->{$storeid}} == 0; > > - my $targetsid = PVE::QemuServer::map_storage($self->{opts}->{storagemap}, $storeid); > + my $targetsid = PVE::QemuServer::map_id($self->{opts}->{storagemap}, $storeid); > # check if storage is available on target node > my $target_scfg = PVE::Storage::storage_check_enabled( > $storecfg, > @@ -479,7 +479,7 @@ sub scan_local_volumes { > my $targetsid = $sid; > # NOTE: we currently ignore shared source storages in mappings so skip here too for now > if (!$scfg->{shared}) { > - $targetsid = PVE::QemuServer::map_storage($self->{opts}->{storagemap}, $sid); > + $targetsid = PVE::QemuServer::map_id($self->{opts}->{storagemap}, $sid); > } > > 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', { > }); > > > -sub map_storage { > +# maps source to target ID > +# currently used for targetstorage and targetbridge when migrating > +sub map_id { > my ($map, $source) = @_; > > 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 = map_storage($storagemap, $storeid); > + $storeid = map_id($storagemap, $storeid); > my ($defFormat, $validFormats) = PVE::Storage::storage_default_format($storecfg, $storeid); > my $scfg = PVE::Storage::storage_config($storecfg, $storeid); > my $fileFormat = qemu_img_format($scfg, $volname); >