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 2AB3C64608 for ; Thu, 3 Mar 2022 13:31:27 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 20CBB31E3B for ; Thu, 3 Mar 2022 13:31:27 +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 4ED3131E2C for ; Thu, 3 Mar 2022 13:31:26 +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 2801346E92 for ; Thu, 3 Mar 2022 13:31:26 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 3 Mar 2022 13:31:21 +0100 Message-Id: <20220303123121.109758-4-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220303123121.109758-1-f.ebner@proxmox.com> References: <20220303123121.109758-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.128 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 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. [zfspoolplugin.pm] Subject: [pve-devel] [PATCH storage 1/1] zfs: volume import: use correct format for renaming 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: Thu, 03 Mar 2022 12:31:27 -0000 Previously, the transport format (which currently is always 'zfs') was passed in, resulting in subvol-disks not to be renamed correctly. Fixes: a97d3ee ("Introduce allow_rename parameter for pvesm import and storage_migrate") Signed-off-by: Fabian Ebner --- PVE/Storage/ZFSPoolPlugin.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/PVE/Storage/ZFSPoolPlugin.pm b/PVE/Storage/ZFSPoolPlugin.pm index e952a5c..343f833 100644 --- a/PVE/Storage/ZFSPoolPlugin.pm +++ b/PVE/Storage/ZFSPoolPlugin.pm @@ -770,7 +770,9 @@ sub volume_import { die "internal error: invalid file handle for volume_import\n" if !defined($fd); - my (undef, $dataset, $vmid) = $class->parse_volname($volname); + my (undef, $dataset, $vmid, undef, undef, undef, $volume_format) = + $class->parse_volname($volname); + my $zfspath = "$scfg->{pool}/$dataset"; my $suffix = defined($base_snapshot) ? "\@$base_snapshot" : ''; my $exists = 0 == run_command(['zfs', 'get', '-H', 'name', $zfspath.$suffix], @@ -780,7 +782,7 @@ sub volume_import { } elsif ($exists) { die "volume '$zfspath' already exists\n" if !$allow_rename; warn "volume '$zfspath' already exists - importing with a different name\n"; - $dataset = $class->find_free_diskname($storeid, $scfg, $vmid, $format); + $dataset = $class->find_free_diskname($storeid, $scfg, $vmid, $volume_format); $zfspath = "$scfg->{pool}/$dataset"; } -- 2.30.2