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 5409D60EDA for ; Fri, 25 Sep 2020 16:13:36 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6A94C1C250 for ; Fri, 25 Sep 2020 16:13:34 +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 076931C188 for ; Fri, 25 Sep 2020 16:13:30 +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 C7F32456E6 for ; Fri, 25 Sep 2020 16:13:29 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 25 Sep 2020 16:13:24 +0200 Message-Id: <20200925141327.25024-12-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200925141327.25024-1-d.csapak@proxmox.com> References: <20200925141327.25024-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.171 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [status.rs] Subject: [pbs-devel] [PATCH proxmox-backup 08/10] api2/status: use the TaskListInfoIterator here 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: Fri, 25 Sep 2020 14:13:36 -0000 this means that limiting with epoch now works correctly also change the api type to i64, since that is what the starttime is saved as Signed-off-by: Dominik Csapak --- src/api2/status.rs | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/src/api2/status.rs b/src/api2/status.rs index eb8c43cd..89bc4adc 100644 --- a/src/api2/status.rs +++ b/src/api2/status.rs @@ -182,7 +182,7 @@ fn datastore_status( input: { properties: { since: { - type: u64, + type: i64, description: "Only list tasks since this UNIX epoch.", optional: true, }, @@ -200,6 +200,7 @@ fn datastore_status( )] /// List tasks. pub fn list_tasks( + since: Option, _param: Value, rpcenv: &mut dyn RpcEnvironment, ) -> Result, Error> { @@ -209,13 +210,28 @@ pub fn list_tasks( let user_privs = user_info.lookup_privs(&userid, &["system", "tasks"]); let list_all = (user_privs & PRIV_SYS_AUDIT) != 0; - - // TODO: replace with call that gets all task since 'since' epoch - let list: Vec = server::read_task_list()? - .into_iter() - .map(TaskListItem::from) - .filter(|entry| list_all || entry.user == userid) - .collect(); + let since = since.unwrap_or_else(|| 0); + + let list: Vec = server::TaskListInfoIterator::new()? + .take_while(|info| { + match info { + Ok(info) => info.upid.starttime > since, + Err(_) => false + } + }) + .filter_map(|info| { + match info { + Ok(info) => { + if list_all || info.upid.userid == userid { + Some(Ok(TaskListItem::from(info))) + } else { + None + } + } + Err(err) => Some(Err(err)) + } + }) + .collect::, Error>>()?; Ok(list.into()) } -- 2.20.1