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 F31CB647EB for ; Fri, 30 Oct 2020 15:02:17 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F174414785 for ; Fri, 30 Oct 2020 15:02:17 +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 8915E14619 for ; Fri, 30 Oct 2020 15:02:16 +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 49C5245FA8 for ; Fri, 30 Oct 2020 15:02:16 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 30 Oct 2020 15:02:11 +0100 Message-Id: <20201030140215.13329-4-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201030140215.13329-1-d.csapak@proxmox.com> References: <20201030140215.13329-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.183 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_NUMSUBJECT 0.5 Subject ends in numbers excluding current years 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [tasks.rs] Subject: [pbs-devel] [PATCH proxmox-backup 2/6] api2/node/tasks: change limit behaviour when it is 0 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, 30 Oct 2020 14:02:18 -0000 instead of returning 0 elements (which does not really make sense anyway), change it so that there is no limit anymore (besides usize::MAX) this is technically a breaking change for the api, but i guess no one is using limit=0 for anything sensible anyway Signed-off-by: Dominik Csapak --- src/api2/node/tasks.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/api2/node/tasks.rs b/src/api2/node/tasks.rs index 9146d351..00516f3b 100644 --- a/src/api2/node/tasks.rs +++ b/src/api2/node/tasks.rs @@ -271,7 +271,7 @@ fn stop_task( }, limit: { type: u64, - description: "Only list this amount of tasks.", + description: "Only list this amount of tasks. (0 means no limit)", default: 50, optional: true, }, @@ -328,6 +328,7 @@ pub fn list_tasks( let store = param["store"].as_str(); let list = TaskListInfoIterator::new(running)?; + let limit = if limit > 0 { limit as usize } else { usize::MAX }; let result: Vec = list .take_while(|info| !info.is_err()) @@ -372,11 +373,11 @@ pub fn list_tasks( Some(info.into()) }).skip(start as usize) - .take(limit as usize) + .take(limit) .collect(); 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 + if result.len() > 0 && result.len() >= limit { // we have a 'virtual' entry as long as we have any new count += 1; } -- 2.20.1