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 D0D4560F1F for ; Fri, 25 Sep 2020 16:14:05 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0A6351C24D 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 EC67F1C187 for ; Fri, 25 Sep 2020 16:13:29 +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 B85DC456A3 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:25 +0200 Message-Id: <20200925141327.25024-13-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.174 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 09/10] server/worker_task: remove unecessary 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: Fri, 25 Sep 2020 14:14:05 -0000 since there are no users of this anymore and we now have a nicer TaskListInfoIterator to use, we can drop this function this also means that 'update_active_workers' does not need to return a list anymore since we never used that result besides in read_task_list Signed-off-by: Dominik Csapak --- src/server/worker_task.rs | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/server/worker_task.rs b/src/server/worker_task.rs index 622453a1..8838db38 100644 --- a/src/server/worker_task.rs +++ b/src/server/worker_task.rs @@ -345,8 +345,7 @@ fn lock_task_list_files(exclusive: bool) -> Result { // atomically read/update the task list, update status of finished tasks // new_upid is added to the list when specified. -// Returns a sorted list of known tasks, -fn update_active_workers(new_upid: Option<&UPID>) -> Result, Error> { +fn update_active_workers(new_upid: Option<&UPID>) -> Result<(), Error> { let backup_user = crate::backup::backup_user()?; @@ -427,16 +426,7 @@ fn update_active_workers(new_upid: Option<&UPID>) -> Result, E drop(lock); - finish_list.append(&mut active_list); - finish_list.reverse(); - Ok(finish_list) -} - -/// Returns a sorted list of known tasks -/// -/// The list is sorted by `(starttime, endtime)` in ascending order -pub fn read_task_list() -> Result, Error> { - update_active_workers(None) + Ok(()) } fn render_task_line(info: &TaskListInfo) -> String { -- 2.20.1