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 2E2EC1FF15C for ; Wed, 19 Feb 2025 10:24:46 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7CE9F1B99E; Wed, 19 Feb 2025 10:24:39 +0100 (CET) Message-ID: Date: Wed, 19 Feb 2025 10:24:32 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: Proxmox VE development discussion , Maximiliano Sandoval References: <20250218162844.476120-1-m.sandoval@proxmox.com> Content-Language: en-US From: Fiona Ebner In-Reply-To: <20250218162844.476120-1-m.sandoval@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL -0.445 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 POISEN_SPAM_PILL 0.1 Meta: its spam POISEN_SPAM_PILL_1 0.1 random spam to be learned in bayes POISEN_SPAM_PILL_3 0.1 random spam to be learned in bayes 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. [btrfsplugin.pm] URI_NOVOWEL 0.5 URI hostname has long non-vowel sequence Subject: Re: [pve-devel] [PATCH storage v2 1/2] fix #3873: btrfs: check for correct subvolume taking snapshot 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" Am 18.02.25 um 17:28 schrieb Maximiliano Sandoval: > Suppose we are taking a snapshot of VM 100's disk-0. The > dir_glob_foreach runs over $path=/subvolume/images/100, lists all > snapshot names and appends their names to the path of the disk, e.g. > /subvolume/images/vm-100-disk-0@SNAP_NAME, but the original directory > $path might contain a second disk `vm-100-disk-1` which is also listed > by the dir_glib_foreach. > > This change adds a helper foreach_snapshot_of_subvol which only lists > snapshots for the current volume. > > The helper is also implemented in the other place where we iterate over > snapshots. > > Signed-off-by: Maximiliano Sandoval > --- > > Differences from v1: > - Add a helper to run callback on each snapshot. > > src/PVE/Storage/BTRFSPlugin.pm | 25 +++++++++++++++++++------ > 1 file changed, 19 insertions(+), 6 deletions(-) > > diff --git a/src/PVE/Storage/BTRFSPlugin.pm b/src/PVE/Storage/BTRFSPlugin.pm > index cadd9d1..d21c831 100644 > --- a/src/PVE/Storage/BTRFSPlugin.pm > +++ b/src/PVE/Storage/BTRFSPlugin.pm > @@ -419,6 +419,20 @@ my sub foreach_subvol : prototype($$) { > }) > } > > +# Calls `$code->($volume, $snap_name)` for each snapshot of the subvolume. > +my sub foreach_snapshot_of_subvol : prototype($$) { We can just rename foreach_subvol() and the $BTRFS_VOL_REGEX instead of adding this new wrapper. As already written in the review of v1, the regex requires a snapshot to be present. This means the regex is a misnomer and the foreach_subvol() helper already operates only on snapshots and can also be renamed. It'd be more concise/straightforward and otherwise, those remain confusing. > + my ($subvol, $code) = @_; > + > + my $basename = basename($subvol); > + my $dir = dirname($subvol); > + foreach_subvol($dir, sub { > + my ($volume, $name, $snap) = @_; > + return if $name ne $basename; > + return if !defined $snap; > + $code->($volume, $snap); > + }); > +} > + > sub free_image { > my ($class, $storeid, $scfg, $volname, $isBase, $_format) = @_; > _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel