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 355EC1FF183 for ; Wed, 16 Jul 2025 08:32:07 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 66CF115DC4; Wed, 16 Jul 2025 08:32:37 +0200 (CEST) To: pve-devel@lists.proxmox.com Date: Wed, 16 Jul 2025 08:31:50 +0200 In-Reply-To: <20250716063153.1647681-1-alexandre.derumier@groupe-cyllene.com> References: <20250716063153.1647681-1-alexandre.derumier@groupe-cyllene.com> MIME-Version: 1.0 Message-ID: List-Id: Proxmox VE development discussion List-Post: From: Alexandre Derumier via pve-devel Precedence: list Cc: Alexandre Derumier X-Mailman-Version: 2.1.29 X-BeenThere: pve-devel@lists.proxmox.com List-Subscribe: , List-Unsubscribe: , List-Archive: Reply-To: Proxmox VE development discussion List-Help: Subject: [pve-devel] [PATCH FOLLOW-UP storage 11/14] plugin: lvmplugin: add parse_snap_name Content-Type: multipart/mixed; boundary="===============8866580400785483811==" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" --===============8866580400785483811== Content-Type: message/rfc822 Content-Disposition: inline Return-Path: X-Original-To: pve-devel@lists.proxmox.com Delivered-To: pve-devel@lists.proxmox.com 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 0D558DACCA for ; Wed, 16 Jul 2025 08:32:35 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 44A3115BC3 for ; Wed, 16 Jul 2025 08:32:10 +0200 (CEST) Received: from bastiontest.odiso.net (unknown [185.151.190.228]) (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 for ; Wed, 16 Jul 2025 08:32:06 +0200 (CEST) Received: from formationkvm1.odiso.net (unknown [10.11.201.57]) by bastiontest.odiso.net (Postfix) with ESMTP id 58697862E5A; Wed, 16 Jul 2025 08:31:56 +0200 (CEST) Received: by formationkvm1.odiso.net (Postfix, from userid 0) id 56263104D614; Wed, 16 Jul 2025 08:31:56 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Subject: [PATCH FOLLOW-UP storage 11/14] plugin: lvmplugin: add parse_snap_name Date: Wed, 16 Jul 2025 08:31:50 +0200 Message-Id: <20250716063153.1647681-16-alexandre.derumier@groupe-cyllene.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250716063153.1647681-1-alexandre.derumier@groupe-cyllene.com> References: <20250716063153.1647681-1-alexandre.derumier@groupe-cyllene.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -1.437 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_NONE 0.1 DMARC none policy HEADER_FROM_DIFFERENT_DOMAINS 0.001 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_NONE 0.25 DKIM has Failed or SPF has failed on the message and the domain has no DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLACK 3 Contains an URL listed in the URIBL blacklist [plugin.pm] Signed-off-by: Alexandre Derumier --- src/PVE/Storage/LVMPlugin.pm | 17 ++++++++++++----- src/PVE/Storage/Plugin.pm | 17 +++++++++++++---- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/src/PVE/Storage/LVMPlugin.pm b/src/PVE/Storage/LVMPlugin.pm index 0e2c38c..6e77eb3 100644 --- a/src/PVE/Storage/LVMPlugin.pm +++ b/src/PVE/Storage/LVMPlugin.pm @@ -458,6 +458,14 @@ my sub get_snap_name { } } +my sub parse_snap_name { + my ($name) = @_; + + if ($name =~ m/^snap_\S+_(.*)\.qcow2$/) { + return $1; + } +} + sub filesystem_path { my ($class, $scfg, $volname, $snapname) = @_; @@ -773,11 +781,10 @@ sub volume_snapshot_info { my $get_snapname_from_path = sub { my ($volname, $path) = @_; - my $basepath = basename($path); - my $name = ($volname =~ s/\.[^.]+$//r); - if ($basepath =~ m/^snap_${name}_(.*)\.qcow2$/) { - return $1; - } elsif ($basepath eq $volname) { + my $name = basename($path); + if (my $snapname = parse_snap_name($name)) { + return $snapname; + } elsif ($name eq $volname) { return 'current'; } return undef; diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm index aafb13c..59ffa5e 100644 --- a/src/PVE/Storage/Plugin.pm +++ b/src/PVE/Storage/Plugin.pm @@ -779,6 +779,14 @@ my sub get_snap_name { return $name; } +my sub parse_snap_name { + my ($name) = @_; + + if ($name =~ m/^snap-(.*)-vm(.*)$/) { + return $1; + } +} + sub filesystem_path { my ($class, $scfg, $volname, $snapname) = @_; @@ -1728,10 +1736,11 @@ sub volume_snapshot_info { my $get_snapname_from_path = sub { my ($volname, $path) = @_; - my $basepath = basename($path); - if ($basepath =~ m/^snap-(.*)-vm(.*)$/) { - return $1; - } elsif ($basepath eq basename($volname)) { + my $name = basename($path); + + if (my $snapname = parse_snap_name($name)) { + return $snapname; + } elsif ($name eq basename($volname)) { return 'current'; } return undef; -- 2.39.5 --===============8866580400785483811== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel --===============8866580400785483811==--