From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 21EEA1FF17A for ; Fri, 18 Jul 2025 15:45:44 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D26F11FA97; Fri, 18 Jul 2025 15:46:49 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Fri, 18 Jul 2025 15:45:32 +0200 Message-ID: <20250718134613.147665-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.2 MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1752846373422 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.027 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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. [lvmthinplugin.pm] Subject: [pve-devel] [PATCH storage] lvm thin plugin: pass format to find_free_diskname() to avoid cosmetic warning 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Since commit eda88c9 ("lvmplugin: add qcow2 snapshot"), the LVM plugin's find_free_diskname() method assumes that the format is set and compares it against a fixed string. When the argument is not set, the method would still behave correctly, but Perl produces a warning. Always pass along the format to find_free_diskname() to fix it. Reported-by: Stefan Hanreich Reported-by: Markus Frank Signed-off-by: Fiona Ebner --- src/PVE/Storage/LvmThinPlugin.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/PVE/Storage/LvmThinPlugin.pm b/src/PVE/Storage/LvmThinPlugin.pm index 6f8a92e..3854e6c 100644 --- a/src/PVE/Storage/LvmThinPlugin.pm +++ b/src/PVE/Storage/LvmThinPlugin.pm @@ -109,7 +109,7 @@ sub alloc_image { die "no such volume group '$vg'\n" if !defined($vgs->{$vg}); - $name = $class->find_free_diskname($storeid, $scfg, $vmid) + $name = $class->find_free_diskname($storeid, $scfg, $vmid, $fmt) if !$name; my $cmd = [ @@ -297,17 +297,17 @@ sub clone_image { my $lv; + my ($isBase, $format) = ($class->parse_volname($volname))[5,6]; + if ($snap) { $lv = "$vg/snap_${volname}_$snap"; } else { - my ($vtype, undef, undef, undef, undef, $isBase, $format) = $class->parse_volname($volname); - die "clone_image only works on base images\n" if !$isBase; $lv = "$vg/$volname"; } - my $name = $class->find_free_diskname($storeid, $scfg, $vmid); + my $name = $class->find_free_diskname($storeid, $scfg, $vmid, $format); my $cmd = ['/sbin/lvcreate', '-n', $name, '-prw', '-kn', '-s', $lv]; run_command($cmd, errmsg => "clone image '$lv' error"); @@ -449,7 +449,7 @@ sub volume_import { die "volume $vg/$volname already exists\n" if !$allow_rename; warn "volume $vg/$volname already exists - importing with a different name\n"; - $tempname = $class->find_free_diskname($storeid, $scfg, $vmid); + $tempname = $class->find_free_diskname($storeid, $scfg, $vmid, $file_format); } else { $tempname = $volname; $tempname =~ s/base/vm/; -- 2.47.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel