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 F3EC869606 for ; Mon, 13 Sep 2021 16:19:05 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DAB3A2AE86 for ; Mon, 13 Sep 2021 16:18:30 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 216B82AE65 for ; Mon, 13 Sep 2021 16:18: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 F2047447F8 for ; Mon, 13 Sep 2021 16:18:29 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Mon, 13 Sep 2021 16:18:23 +0200 Message-Id: <20210913141829.2171301-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210913141829.2171301-1-d.csapak@proxmox.com> References: <20210913141829.2171301-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.394 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox-backup v2 1/7] server: refactor abort_local_worker 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: Mon, 13 Sep 2021 14:19:06 -0000 we'll need this outside the module Signed-off-by: Dominik Csapak --- src/server/worker_task.rs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/server/worker_task.rs b/src/server/worker_task.rs index 2ef8ba9d..c4696a2f 100644 --- a/src/server/worker_task.rs +++ b/src/server/worker_task.rs @@ -102,9 +102,8 @@ pub fn register_task_control_commands( commando_sock.register_command("worker-task-abort".into(), move |args| { let upid = get_upid(args)?; - if let Some(ref worker) = WORKER_TASK_LIST.lock().unwrap().get(&upid.task_id) { - worker.request_abort(); - } + abort_local_worker(upid); + Ok(Value::Null) })?; commando_sock.register_command("worker-task-status".into(), move |args| { @@ -841,3 +840,10 @@ pub async fn wait_for_local_worker(upid_str: &str) -> Result<(), Error> { } Ok(()) } + +/// Request abort of a local worker (if existing and running) +pub fn abort_local_worker(upid: UPID) { + if let Some(ref worker) = WORKER_TASK_LIST.lock().unwrap().get(&upid.task_id) { + worker.request_abort(); + } +} -- 2.30.2