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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 4B6BD75DC6 for ; Wed, 14 Jul 2021 09:01:20 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 409EFC255 for ; Wed, 14 Jul 2021 09:00:50 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 950E2C244 for ; Wed, 14 Jul 2021 09:00:48 +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 34C9B415D4 for ; Wed, 14 Jul 2021 09:00:48 +0200 (CEST) Date: Wed, 14 Jul 2021 09:00:38 +0200 (CEST) From: Dietmar Maurer To: Proxmox Backup Server development discussion , Dominik Csapak Message-ID: <767265988.414.1626246038649@webmail.proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Priority: 3 Importance: Normal X-Mailer: Open-Xchange Mailer v7.10.5-Rev16 X-Originating-Client: open-xchange-appsuite X-SPAM-LEVEL: Spam detection results: 0 AWL 0.906 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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] fix #3526: correctly filter tasks with 'since' and 'until' 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: Wed, 14 Jul 2021 07:01:20 -0000 I guess this would be easier to understand if you use a "for" loop instead of combinators. Please can you try? > On 07/13/2021 3:47 PM Dominik Csapak wrote: > > > The previous assumption was that the Tasks returned by the Iterator are > sorted by the starttime, but that is not actually the case, and > could never have been, since we append the tasks into the log when > they are finished (not started) and running tasks are always iterated > first. > > So to correctly filter, we have to go through all tasks that could > fall into the correct time frame, possibly collecting some along the way > that we have to filter out again in the filter_map. > > Signed-off-by: Dominik Csapak > --- > src/api2/node/tasks.rs | 26 +++++++++++++++++++++++++- > 1 file changed, 25 insertions(+), 1 deletion(-) > > diff --git a/src/api2/node/tasks.rs b/src/api2/node/tasks.rs > index 34e71af1..3d3f7a0a 100644 > --- a/src/api2/node/tasks.rs > +++ b/src/api2/node/tasks.rs > @@ -461,7 +461,15 @@ pub fn list_tasks( > }) > .take_while(|info| { > match (info, since) { > - (Ok(info), Some(since)) => info.upid.starttime > since, > + (Ok(info), Some(since)) => { > + // list is really sorted by endtime, so we have > + // to take until endtime is smaller than 'since' > + if let Some(ref state) = info.state { > + state.endtime() > since > + } else { > + true > + } > + }, > (Ok(_), None) => true, > (Err(_), _) => false, > } > @@ -472,6 +480,22 @@ pub fn list_tasks( > Err(_) => return None, > }; > > + // we have to filter here again for 'until', because there could have > + // been some long running active task that could not have been skipped > + if let Some(until) = until { > + if info.upid.starttime > until { > + return None; > + } > + } > + > + // we have to filter again for 'since', because we have collected > + // until both start and endtime were smaller than since > + if let Some(since) = since { > + if info.upid.starttime < since { > + return None; > + } > + } > + > if !list_all && check_task_access(&auth_id, &info.upid).is_err() { > return None; > } > -- > 2.30.2 > > > > _______________________________________________ > pbs-devel mailing list > pbs-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel