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 942DD62544 for ; Wed, 30 Sep 2020 10:45:08 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 85689168FD for ; Wed, 30 Sep 2020 10:45:08 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id DE755168F0 for ; Wed, 30 Sep 2020 10:45:07 +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 B149945903 for ; Wed, 30 Sep 2020 10:45:07 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Wed, 30 Sep 2020 10:45:06 +0200 Message-Id: <20200930084507.16006-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.149 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. [tasks.rs] Subject: [pbs-devel] [PATCH proxmox-backup 1/2] tasks: improve behaviour on upgrade 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, 30 Sep 2020 08:45:08 -0000 when upgrading from a version where we stored all tasks in the 'active' file, we did not completly account for finished tasks still there we should update the file when encountering any finished task in 'active' as well as filter them out on the api call (if they get through) Signed-off-by: Dominik Csapak --- src/api2/node/tasks.rs | 1 + src/server/worker_task.rs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/api2/node/tasks.rs b/src/api2/node/tasks.rs index 80384ea8..1440859b 100644 --- a/src/api2/node/tasks.rs +++ b/src/api2/node/tasks.rs @@ -352,6 +352,7 @@ pub fn list_tasks( } match info.state { + Some(_) if running => return None, Some(crate::server::TaskState::OK { .. }) if errors => return None, _ => {}, } diff --git a/src/server/worker_task.rs b/src/server/worker_task.rs index be689c7f..b2e2abd5 100644 --- a/src/server/worker_task.rs +++ b/src/server/worker_task.rs @@ -539,7 +539,7 @@ impl TaskListInfoIterator { let needs_update = active_list .iter() - .any(|info| info.state.is_none() && !worker_is_active_local(&info.upid)); + .any(|info| info.state.is_some() || !worker_is_active_local(&info.upid)); if needs_update { drop(lock); -- 2.20.1