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 8CF1361870 for ; Thu, 9 Jul 2020 15:05:42 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7BCF712F80 for ; Thu, 9 Jul 2020 15:05:12 +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 E46B912F77 for ; Thu, 9 Jul 2020 15:05:11 +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 A86AB444A6 for ; Thu, 9 Jul 2020 15:05:11 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Thu, 9 Jul 2020 15:05:11 +0200 Message-Id: <20200709130511.8361-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.000 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] fix cross process task listing 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: Thu, 09 Jul 2020 13:05:42 -0000 it does not make sense to check if the worker is running if we already have an endtime and state our 'worker_is_active_local' heuristic returns true for non process-local tasks, so we got 'running' for all tasks that were not started by 'our' pid and were still running Signed-off-by: Dominik Csapak --- src/server/worker_task.rs | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/src/server/worker_task.rs b/src/server/worker_task.rs index 72c594e..af6686f 100644 --- a/src/server/worker_task.rs +++ b/src/server/worker_task.rs @@ -270,28 +270,22 @@ fn update_active_workers(new_upid: Option<&UPID>) -> Result, E let line = line?; match parse_worker_status_line(&line) { Err(err) => bail!("unable to parse active worker status '{}' - {}", line, err), - Ok((upid_str, upid, state)) => { - - let running = worker_is_active_local(&upid); - - if running { + Ok((upid_str, upid, state)) => match state { + None if worker_is_active_local(&upid) => { active_list.push(TaskListInfo { upid, upid_str, state: None }); - } else { - match state { - None => { - println!("Detected stopped UPID {}", upid_str); - let status = upid_read_status(&upid) - .unwrap_or_else(|_| String::from("unknown")); - finish_list.push(TaskListInfo { - upid, upid_str, state: Some((Local::now().timestamp(), status)) - }); - } - Some((endtime, status)) => { - finish_list.push(TaskListInfo { - upid, upid_str, state: Some((endtime, status)) - }) - } - } + }, + None => { + println!("Detected stopped UPID {}", upid_str); + let status = upid_read_status(&upid) + .unwrap_or_else(|_| String::from("unknown")); + finish_list.push(TaskListInfo { + upid, upid_str, state: Some((Local::now().timestamp(), status)) + }); + }, + Some((endtime, status)) => { + finish_list.push(TaskListInfo { + upid, upid_str, state: Some((endtime, status)) + }) } } } -- 2.20.1