From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id E662B1FF0E5 for ; Wed, 12 Aug 2026 17:33:01 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 2A9D92153E; Wed, 12 Aug 2026 17:33:01 +0200 (CEST) From: Elias Huhsovitz To: pve-devel@lists.proxmox.com Subject: [PATCH storage 1/3] plugin: refactor format parsing in parse_volname and parse_name_dir Date: Wed, 12 Aug 2026 17:32:50 +0200 Message-ID: <20260812153252.222298-2-e.huhsovitz@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260812153252.222298-1-e.huhsovitz@proxmox.com> References: <20260812153252.222298-1-e.huhsovitz@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1786548761706 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.844 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: F6J4SD7ZB6SJE3QMWTOGCTGKCSRJX4OM X-Message-ID-Hash: F6J4SD7ZB6SJE3QMWTOGCTGKCSRJX4OM X-MailFrom: e.huhsovitz@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Elias Huhsovitz X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Previously, `parse_volname` in several plugins (LVM, LvmThin, RBD) hardcoded the returned format to 'raw', ignoring any format extension present in the volume name. This prevented the detection of mismatched formats, such as passing a `.qcow2` name to a raw-only storage. Update `parse_volname` in `LVMPlugin`, `LvmThinPlugin`, and `RBDPlugin` to dynamically extract the format from the volume name extension (e.g., `.raw`, `.qcow2`, `.vmdk`, `.subvol`), falling back to 'raw' if no known extension is present. Ajust `parse_name_dir` in `Plugin.pm` to allow parsing of names without an extension, returning 'raw' as the default format. This prepares the base class for extension-less volume names used by block storages. Signed-off-by: Elias Huhsovitz --- src/PVE/Storage/LVMPlugin.pm | 2 +- src/PVE/Storage/LvmThinPlugin.pm | 6 +++++- src/PVE/Storage/Plugin.pm | 2 ++ src/PVE/Storage/RBDPlugin.pm | 8 +++++++- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/PVE/Storage/LVMPlugin.pm b/src/PVE/Storage/LVMPlugin.pm index 67ba0f7..0f2ef66 100644 --- a/src/PVE/Storage/LVMPlugin.pm +++ b/src/PVE/Storage/LVMPlugin.pm @@ -526,7 +526,7 @@ sub parse_volname { if ($volname =~ m/^(vm-(\d+)-\S+)$/) { my $name = $1; my $vmid = $2; - my $format = $volname =~ m/\.qcow2$/ ? 'qcow2' : 'raw'; + my $format = ($volname =~ m/\.(raw|qcow2|vmdk|subvol)$/) ? $1 : 'raw'; return ('images', $name, $vmid, undef, undef, undef, $format); } diff --git a/src/PVE/Storage/LvmThinPlugin.pm b/src/PVE/Storage/LvmThinPlugin.pm index cadf343..d44e04d 100644 --- a/src/PVE/Storage/LvmThinPlugin.pm +++ b/src/PVE/Storage/LvmThinPlugin.pm @@ -66,7 +66,11 @@ sub parse_volname { PVE::Storage::Plugin::parse_lvm_name($volname); if ($volname =~ m/^((vm|base)-(\d+)-\S+)$/) { - return ('images', $1, $3, undef, undef, $2 eq 'base', 'raw'); + my $name = $1; + my $isbase = $2 eq 'base'; + my $vmid = $3; + my $format = ($volname =~ m/\.(raw|qcow2|vmdk|subvol)$/) ? $1 : 'raw'; + return ('images', $name, $vmid, undef, undef, $isbase, $format); } die "unable to parse lvm volume name '$volname'\n"; diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm index 4f69f9b..c5046a4 100644 --- a/src/PVE/Storage/Plugin.pm +++ b/src/PVE/Storage/Plugin.pm @@ -789,6 +789,8 @@ sub parse_name_dir { return ($1, $4, $isbase); # (name, format, isBase) } elsif ($name =~ m!^snap-.*\.qcow2$!) { die "'$name' is a snapshot filename, not a volume!\n"; + } elsif ($name =~ m!^((base-)?[^/\s]+)$!) { + return ($1, 'raw', $2); # (name, format, isBase) } elsif ($name =~ m!^((base-)?[^/\s]+\.(raw|qcow2|vmdk|subvol))$!) { return ($1, $3, $2); # (name ,format, isBase) } diff --git a/src/PVE/Storage/RBDPlugin.pm b/src/PVE/Storage/RBDPlugin.pm index b537425..8ebb999 100644 --- a/src/PVE/Storage/RBDPlugin.pm +++ b/src/PVE/Storage/RBDPlugin.pm @@ -510,7 +510,13 @@ sub parse_volname { my ($class, $volname) = @_; if ($volname =~ m/^((base-(\d+)-\S+)\/)?((base)?(vm)?-(\d+)-\S+)$/) { - return ('images', $4, $7, $2, $3, $5, 'raw'); + my $basename = $2; + my $basevmid = $3; + my $name = $4; + my $isbase = $5; + my $vmid = $7; + my $format = ($volname =~ m/\.(raw|qcow2|vmdk|subvol)$/) ? $1 : 'raw'; + return ('images', $name, $vmid, $basename, $basevmid, $isbase, $format); } die "unable to parse rbd volume name '$volname'\n"; -- 2.47.3