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 D7CAB6181D for ; Thu, 9 Jul 2020 14:45:55 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D440512868 for ; Thu, 9 Jul 2020 14:45:55 +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 4A78D12859 for ; Thu, 9 Jul 2020 14:45:55 +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 17A22444B2 for ; Thu, 9 Jul 2020 14:45:55 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 9 Jul 2020 14:45:45 +0200 Message-Id: <20200709124547.2913-6-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200709124547.2913-1-f.ebner@proxmox.com> References: <20200709124547.2913-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.240 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 Subject: [pve-devel] [PATCH v4 manager 5/7] make use of archive_info and archive_remove 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: Thu, 09 Jul 2020 12:45:55 -0000 to avoid some code duplication. Signed-off-by: Fabian Ebner --- PVE/VZDump.pm | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index 601cd56e..2f509555 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -631,10 +631,15 @@ sub get_backup_file_list { my $bklist = []; foreach my $fn (<$dir/${bkname}-*>) { next if $exclude_fn && $fn eq $exclude_fn; - if ($fn =~ m!/(${bkname}-(\d{4})_(\d{2})_(\d{2})-(\d{2})_(\d{2})_(\d{2})\.(tgz|((tar|vma)(\.(${\PVE::Storage::Plugin::COMPRESSOR_RE}))?)))$!) { - $fn = "$dir/$1"; # untaint - my $t = timelocal ($7, $6, $5, $4, $3 - 1, $2); - push @$bklist, [$fn, $t]; + + my $archive_info = eval { PVE::Storage::archive_info($fn) } // {}; + if ($archive_info->{is_std_name}) { + my $filename = $archive_info->{filename}; + my $backup = { + 'path' => "$dir/$filename", + 'ctime' => $archive_info->{ctime}, + }; + push @{$bklist}, $backup; } } @@ -927,15 +932,13 @@ sub exec_backup_task { $opts->{scfg}, $opts->{storage}, 'prune', $args, logfunc => $logfunc); } else { my $bklist = get_backup_file_list($opts->{dumpdir}, $bkname, $task->{target}); - $bklist = [ sort { $b->[1] <=> $a->[1] } @$bklist ]; + $bklist = [ sort { $b->{ctime} <=> $a->{ctime} } @$bklist ]; while (scalar (@$bklist) >= $maxfiles) { my $d = pop @$bklist; - debugmsg ('info', "delete old backup '$d->[0]'", $logfd); - unlink $d->[0]; - my $logfn = $d->[0]; - $logfn =~ s/\.(tgz|((tar|vma)(\.(${\PVE::Storage::Plugin::COMPRESSOR_RE}))?))$/\.log/; - unlink $logfn; + my $archive_path = $d->{path}; + debugmsg ('info', "delete old backup '$archive_path'", $logfd); + PVE::Storage::archive_remove($archive_path); } } } -- 2.20.1