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 A63E461D35 for ; Mon, 28 Sep 2020 15:32:48 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 95C322EAF7 for ; Mon, 28 Sep 2020 15:32:18 +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 3229D2EA9D for ; Mon, 28 Sep 2020 15:32:14 +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 F014543FAE for ; Mon, 28 Sep 2020 15:32:13 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Mon, 28 Sep 2020 15:32:09 +0200 Message-Id: <20200928133212.409-7-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200928133212.409-1-d.csapak@proxmox.com> References: <20200928133212.409-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.161 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records 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_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pbs-devel] [PATCH proxmox-backup v2 6/9] api2/node/tasks: use TaskListInfoIterator instead of read_task_list 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, 28 Sep 2020 13:32:48 -0000 this makes the filtering/limiting much nicer and readable since we now have potentially an 'infinite' amount of tasks we iterate over, and cannot now beforehand how many there are, we return the total count as always 1 higher then requested iff we are not at the end (this is the case when the amount of entries is smaller than the requested limit) Signed-off-by: Dominik Csapak --- changes from v1: * filter running with new Iterator option 'active_only' * add a 'take_while' at the beginning to stop on the first error src/api2/node/tasks.rs | 52 ++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/src/api2/node/tasks.rs b/src/api2/node/tasks.rs index e6a58a82..80384ea8 100644 --- a/src/api2/node/tasks.rs +++ b/src/api2/node/tasks.rs @@ -10,7 +10,7 @@ use proxmox::{identity, list_subdirs_api_method, sortable}; use crate::tools; use crate::api2::types::*; -use crate::server::{self, UPID, TaskState}; +use crate::server::{self, UPID, TaskState, TaskListInfoIterator}; use crate::config::acl::{PRIV_SYS_AUDIT, PRIV_SYS_MODIFY}; use crate::config::cached_user_info::CachedUserInfo; @@ -316,56 +316,54 @@ pub fn list_tasks( let store = param["store"].as_str(); + let list = TaskListInfoIterator::new(running)?; - let list = server::read_task_list()?; - - let mut result = vec![]; - - let mut count = 0; - - for info in list { - if !list_all && info.upid.userid != userid { continue; } + let result: Vec = list + .take_while(|info| !info.is_err()) + .filter_map(|info| { + let info = match info { + Ok(info) => info, + Err(_) => return None, + }; + if !list_all && info.upid.userid != userid { return None; } if let Some(userid) = &userfilter { - if !info.upid.userid.as_str().contains(userid) { continue; } + if !info.upid.userid.as_str().contains(userid) { return None; } } if let Some(store) = store { // Note: useful to select all tasks spawned by proxmox-backup-client let worker_id = match &info.upid.worker_id { Some(w) => w, - None => continue, // skip + None => return None, // skip }; if info.upid.worker_type == "backup" || info.upid.worker_type == "restore" || info.upid.worker_type == "prune" { let prefix = format!("{}_", store); - if !worker_id.starts_with(&prefix) { continue; } + if !worker_id.starts_with(&prefix) { return None; } } else if info.upid.worker_type == "garbage_collection" { - if worker_id != store { continue; } + if worker_id != store { return None; } } else { - continue; // skip + return None; // skip } } - if let Some(ref state) = info.state { - if running { continue; } - match state { - crate::server::TaskState::OK { .. } if errors => continue, - _ => {}, - } + match info.state { + Some(crate::server::TaskState::OK { .. }) if errors => return None, + _ => {}, } - if (count as u64) < start { - count += 1; - continue; - } else { - count += 1; - } + Some(info.into()) + }).skip(start as usize) + .take(limit as usize) + .collect(); - if (result.len() as u64) < limit { result.push(info.into()); }; + let mut count = result.len() + start as usize; + if result.len() > 0 && result.len() >= limit as usize { // we have a 'virtual' entry as long as we have any new + count += 1; } rpcenv["total"] = Value::from(count); -- 2.20.1