From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 18D0A1FF168 for ; Tue, 4 Feb 2025 15:18:21 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 776E218797; Tue, 4 Feb 2025 15:18:20 +0100 (CET) Message-ID: Date: Tue, 4 Feb 2025 15:18:17 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: Proxmox Backup Server development discussion , Hannes Laimer References: <20250116064543.74619-1-h.laimer@proxmox.com> <20250116064543.74619-2-h.laimer@proxmox.com> Content-Language: en-US, de-DE From: Christian Ebner In-Reply-To: <20250116064543.74619-2-h.laimer@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.030 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pbs-devel] [PATCH proxmox 1/7] rest-server: add function that returns a join handle for spawn 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: , Reply-To: Proxmox Backup Server development discussion Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" nit inline On 1/16/25 07:45, Hannes Laimer wrote: > We need this handle when we want to start multiple jobs sequentially > from a 'manage' task. With the handle we can avoid polling for the > task status with its upid. > > Signed-off-by: Hannes Laimer > --- > proxmox-rest-server/src/worker_task.rs | 21 +++++++++++++++++++-- > 1 file changed, 19 insertions(+), 2 deletions(-) > > diff --git a/proxmox-rest-server/src/worker_task.rs b/proxmox-rest-server/src/worker_task.rs > index beec691e..020bdb95 100644 > --- a/proxmox-rest-server/src/worker_task.rs > +++ b/proxmox-rest-server/src/worker_task.rs > @@ -14,6 +14,7 @@ use serde::{Deserialize, Serialize}; > use serde_json::{json, Value}; > use tokio::signal::unix::SignalKind; > use tokio::sync::{oneshot, watch}; > +use tokio::task::JoinHandle; > use tracing::{info, warn}; > > use proxmox_daemon::command_socket::CommandSocket; > @@ -942,6 +943,22 @@ impl WorkerTask { > to_stdout: bool, > f: F, > ) -> Result > + where > + F: Send + 'static + FnOnce(Arc) -> T, > + T: Send + 'static + Future>, > + { > + let (upid_str, _) = Self::spawn_with_handle(worker_type, worker_id, auth_id, to_stdout, f)?; > + Ok(upid_str) > + } > + nit: docstring for `spawn_with_handle` should primarily tell what it does, only secondarily what it is used for. Maybe something like: ``` /// Spawn a new worker task with log context like `spawn`, but return the tasks join handle in addition to its upid. /// Allows for a management tasks to handle multiple worker tasks. ``` > + /// Needed when a 'management' task starts multiple tasks sequentially > + pub fn spawn_with_handle( > + worker_type: &str, > + worker_id: Option, > + auth_id: String, > + to_stdout: bool, > + f: F, > + ) -> Result<(String, JoinHandle<()>), Error> > where > F: Send + 'static + FnOnce(Arc) -> T, > T: Send + 'static + Future>, > @@ -950,12 +967,12 @@ impl WorkerTask { > let upid_str = worker.upid.to_string(); > let f = f(worker.clone()); > > - tokio::spawn(LogContext::new(logger).scope(async move { > + let handle = tokio::spawn(LogContext::new(logger).scope(async move { > let result = f.await; > worker.log_result(&result); > })); > > - Ok(upid_str) > + Ok((upid_str, handle)) > } > > /// Create a new worker thread. _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel