From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 0D0B571A44 for ; Fri, 9 Apr 2021 08:59:35 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F1B21224F5 for ; Fri, 9 Apr 2021 08:59:34 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 id 28578224E4 for ; Fri, 9 Apr 2021 08:59:34 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id DD68E41FD8 for ; Fri, 9 Apr 2021 08:59:33 +0200 (CEST) To: pve-devel@lists.proxmox.com References: <20210407102537.28046-1-f.ebner@proxmox.com> From: Fabian Ebner Message-ID: <1b9dd2b2-2ccc-bcb1-6a5e-39df221a579b@proxmox.com> Date: Fri, 9 Apr 2021 08:59:28 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 In-Reply-To: <20210407102537.28046-1-f.ebner@proxmox.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.007 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com, plugin.pm] Subject: Re: [pve-devel] [PATCH storage 1/2] plugin: subdir files: backup: don't match for vmid against the full path 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: , X-List-Received-Date: Fri, 09 Apr 2021 06:59:35 -0000 Am 07.04.21 um 12:25 schrieb Fabian Ebner: > Only match against the file name to avoid false positives with directory names > containing "-$vmid-". > > Signed-off-by: Fabian Ebner > --- > > Found while trying to debug/reproduce a forum thread[0], but the path there > should not be affected by this... > This was in fact the issue. The user used a pseudonym for the storage name/path, and the actual path is affected. So I suppose the link to the forum thread could go into the commit message for completeness. > [0]: https://forum.proxmox.com/threads/vzdump-removing-too-many-backups.87072/ > > PVE/Storage/Plugin.pm | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm > index d2d8184..05f1701 100644 > --- a/PVE/Storage/Plugin.pm > +++ b/PVE/Storage/Plugin.pm > @@ -1034,11 +1034,13 @@ my $get_subdir_files = sub { > $info = { volid => "$sid:vztmpl/$1", format => "t$2" }; > > } elsif ($tt eq 'backup') { > - next if defined($vmid) && $fn !~ m/\S+-$vmid-\S+/; > next if $fn !~ m!/([^/]+\.(tgz|(?:(?:tar|vma)(?:\.(${\COMPRESSOR_RE}))?)))$!; > my $original = $fn; > my $format = $2; > $fn = $1; > + > + next if defined($vmid) && $fn !~ m/\S+-$vmid-\S+/; > + > $info = { volid => "$sid:backup/$fn", format => $format }; > > my $archive_info = eval { PVE::Storage::archive_info($fn) } // {}; >