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 B300C71228 for ; Wed, 7 Apr 2021 12:26:12 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A88D0F6D8 for ; Wed, 7 Apr 2021 12:25:42 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id A56CEF6C7 for ; Wed, 7 Apr 2021 12:25:41 +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 77D99459F3 for ; Wed, 7 Apr 2021 12:25:41 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Wed, 7 Apr 2021 12:25:37 +0200 Message-Id: <20210407102537.28046-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210407102537.28046-1-f.ebner@proxmox.com> References: <20210407102537.28046-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 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. [plugin.pm] Subject: [pve-devel] [PATCH storage 2/2] prune backups: make vmid filtering more robust 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: Wed, 07 Apr 2021 10:26:12 -0000 by relying on archive_info's vmid first. archive_info is already used to determine if it's a standard name, and in that case the vmid is certainly set. Also add asserts to make sure we got what we expected. Signed-off-by: Fabian Ebner --- continuing from previous patch: ...but it really seems that something went wrong with the vmids for the listing, and making it more robust shouldn't hurt. PVE/Storage/Plugin.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm index 05f1701..07eb88f 100644 --- a/PVE/Storage/Plugin.pm +++ b/PVE/Storage/Plugin.pm @@ -1233,9 +1233,9 @@ sub prune_backups { foreach my $backup (@{$backups}) { my $volid = $backup->{volid}; - my $backup_vmid = $backup->{vmid}; my $archive_info = eval { PVE::Storage::archive_info($volid) } // {}; my $backup_type = $archive_info->{type} // 'unknown'; + my $backup_vmid = $archive_info->{vmid} // $backup->{vmid}; next if defined($type) && $type ne $backup_type; @@ -1248,6 +1248,9 @@ sub prune_backups { $prune_entry->{vmid} = $backup_vmid if defined($backup_vmid); if ($archive_info->{is_std_name}) { + die "internal error - got no vmid\n" if !defined($backup_vmid); + die "internal error - got wrong vmid\n" if defined($vmid) && $backup_vmid ne $vmid; + $prune_entry->{ctime} = $archive_info->{ctime}; my $group = "$backup_type/$backup_vmid"; push @{$backup_groups->{$group}}, $prune_entry; -- 2.20.1