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 1D0E560469 for ; Mon, 14 Dec 2020 16:08:39 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0CCE9A08A for ; Mon, 14 Dec 2020 16:08:09 +0100 (CET) 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 8E0B2A07D for ; Mon, 14 Dec 2020 16:08:08 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 53F26450C9 for ; Mon, 14 Dec 2020 16:08:08 +0100 (CET) To: pbs-devel@lists.proxmox.com References: <20201214150453.28946-1-f.ebner@proxmox.com> From: Fabian Ebner Message-ID: Date: Mon, 14 Dec 2020 16:08:03 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.5.1 MIME-Version: 1.0 In-Reply-To: <20201214150453.28946-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.008 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 Subject: Re: [pbs-devel] [PATCH proxmox-backup] prune sim: correctly keep track of already included backups X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Dec 2020 15:08:39 -0000 Forgot to mention that it's better viewed with --patience Am 14.12.20 um 16:04 schrieb Fabian Ebner: > This needs to happen in a separate loop, because some time intervals are not > subsets of others, i.e. weeks and months. Previously, with a daily backup > schedule, having: > * a backup on Sun, 06 Dec 2020 kept by keep-daily > * a backup on Sun, 29 Nov 2020 kept by keep-weekly > would lead to the backup on Mon, 30 Nov 2020 to be selected for keep-monthly, > because the iteration did not yet reach the backup on Sun, 29 Nov 2020 that > would mark November as being covered. > > Signed-off-by: Fabian Ebner > --- > docs/prune-simulator/prune-simulator.js | 17 +++++++++-------- > 1 file changed, 9 insertions(+), 8 deletions(-) > > diff --git a/docs/prune-simulator/prune-simulator.js b/docs/prune-simulator/prune-simulator.js > index 5533c2d6..55cd548b 100644 > --- a/docs/prune-simulator/prune-simulator.js > +++ b/docs/prune-simulator/prune-simulator.js > @@ -485,16 +485,17 @@ Ext.onReady(function() { > > backups.forEach(function(backup) { > let mark = backup.mark; > - let id = idFunc(backup); > - > - if (finished || alreadyIncluded[id]) { > - return; > + if (mark && mark === 'keep') { > + let id = idFunc(backup); > + alreadyIncluded[id] = true; > } > + }); > > - if (mark) { > - if (mark === 'keep') { > - alreadyIncluded[id] = true; > - } > + backups.forEach(function(backup) { > + let mark = backup.mark; > + let id = idFunc(backup); > + > + if (finished || alreadyIncluded[id] || mark) { > return; > } > >