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 6585F8604B for ; Wed, 22 Dec 2021 14:53:21 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0521417131 for ; Wed, 22 Dec 2021 14:53:20 +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 634B516DF3 for ; Wed, 22 Dec 2021 14:53:10 +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 3A6BD45CB9 for ; Wed, 22 Dec 2021 14:53:10 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Wed, 22 Dec 2021 14:52:54 +0100 Message-Id: <20211222135257.3242938-19-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211222135257.3242938-1-f.gruenbichler@proxmox.com> References: <20211222135257.3242938-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.230 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 Subject: [pve-devel] [PATCH v3 storage 1/4] volname_for_storage: parse volname before calling 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: Wed, 22 Dec 2021 13:53:21 -0000 to allow reusing this with remote migration, where parsing of the source volid has to happen on the source node, but this call has to happen on the target node. Signed-off-by: Fabian Grünbichler --- new in v3 PVE/Storage.pm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/PVE/Storage.pm b/PVE/Storage.pm index d64019f..05be3dd 100755 --- a/PVE/Storage.pm +++ b/PVE/Storage.pm @@ -623,19 +623,20 @@ sub abs_filesystem_path { return $path; } +# used as last resort to adapt volnames when migrating my $volname_for_storage = sub { - my ($cfg, $volid, $target_storeid) = @_; + my ($cfg, $storeid, $name, $vmid, $format) = @_; - my (undef, $name, $vmid, undef, undef, undef, $format) = parse_volname($cfg, $volid); - my $target_scfg = storage_config($cfg, $target_storeid); + my $scfg = storage_config($cfg, $storeid); - my (undef, $valid_formats) = PVE::Storage::Plugin::default_format($target_scfg); + my (undef, $valid_formats) = PVE::Storage::Plugin::default_format($scfg); my $format_is_valid = grep { $_ eq $format } @$valid_formats; - die "unsupported format '$format' for storage type $target_scfg->{type}\n" if !$format_is_valid; + die "unsupported format '$format' for storage type $scfg->{type}\n" + if !$format_is_valid; (my $name_without_extension = $name) =~ s/\.$format$//; - if ($target_scfg->{path}) { + if ($scfg->{path}) { return "$vmid/$name_without_extension.$format"; } else { return "$name_without_extension"; @@ -667,7 +668,8 @@ sub storage_migrate { } elsif ($scfg->{type} eq $tcfg->{type}) { $target_volname = $volname; } else { - $target_volname = $volname_for_storage->($cfg, $volid, $target_storeid); + my (undef, $name, $vmid, undef, undef, undef, $format) = parse_volname($cfg, $volid); + $target_volname = $volname_for_storage->($cfg, $target_storeid, $name, $vmid, $format); } my $target_volid = "${target_storeid}:${target_volname}"; -- 2.30.2