From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id DE4E61FF183 for ; Wed, 30 Jul 2025 18:20:03 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1B11D14884; Wed, 30 Jul 2025 18:21:24 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Wed, 30 Jul 2025 18:20:56 +0200 Message-ID: <20250730162117.160498-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250730162117.160498-1-f.ebner@proxmox.com> References: <20250730162117.160498-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753892469587 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. [lvmplugin.pm] Subject: [pve-devel] [PATCH storage 2/3] fix #6587: lvm plugin: snapshot info: fix parsing snapshot name 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" Volume names are allowed to contain underscores, so it is impossible to determine the snapshot name from just the volume name, e.g: snap_vm-100-disk_with_underscore_here_s_some_more.qcow2 Therefore, pass along the short volume name too and match against it. Note that none of the variables from the result of parse_volname() were actually used previously. Signed-off-by: Fiona Ebner --- src/PVE/Storage/LVMPlugin.pm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/PVE/Storage/LVMPlugin.pm b/src/PVE/Storage/LVMPlugin.pm index 705585f..2026450 100644 --- a/src/PVE/Storage/LVMPlugin.pm +++ b/src/PVE/Storage/LVMPlugin.pm @@ -470,9 +470,11 @@ my sub get_snap_name { } my sub parse_snap_name { - my ($name) = @_; + my ($name, $short_volname) = @_; - if ($name =~ m/^snap_\S+_(.*)\.qcow2$/) { + $short_volname =~ s/\.(qcow2)$//; + + if ($name =~ m/^snap_\Q$short_volname\E_(.*)\.qcow2$/) { return $1; } } @@ -799,11 +801,13 @@ sub status { sub volume_snapshot_info { my ($class, $scfg, $storeid, $volname) = @_; + my $short_volname = ($class->parse_volname($volname))[1]; + my $get_snapname_from_path = sub { my ($path) = @_; my $name = basename($path); - if (my $snapname = parse_snap_name($name)) { + if (my $snapname = parse_snap_name($name, $short_volname)) { return $snapname; } elsif ($name eq $volname) { return 'current'; @@ -812,8 +816,6 @@ sub volume_snapshot_info { }; my $path = $class->filesystem_path($scfg, $volname); - my ($vtype, $name, $vmid, $basename, $basevmid, $isBase, $format) = - $class->parse_volname($volname); my $json = PVE::Storage::Common::qemu_img_info($path, undef, 10, 1); die "failed to query file information with qemu-img\n" if !$json; -- 2.47.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel