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 5683163C65 for ; Thu, 27 Jan 2022 11:56:04 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 42777215B4 for ; Thu, 27 Jan 2022 11:56:04 +0100 (CET) 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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 568D42156A for ; Thu, 27 Jan 2022 11:56:02 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 24A2D46CD9 for ; Thu, 27 Jan 2022 11:56:02 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 27 Jan 2022 11:55:54 +0100 Message-Id: <20220127105601.2741602-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220127105601.2741602-1-d.csapak@proxmox.com> References: <20220127105601.2741602-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.161 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: [pve-devel] [PATCH proxmox-backup 1/5] restore-daemon: start disk initialization in parallel to the api X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jan 2022 10:56:04 -0000 this way, the vm can start up faster, and the actual disk init happens in parallel. this avoids unnecessary timeouts when starting the vm if the call panics, we still abort the vm with an error Signed-off-by: Dominik Csapak --- proxmox-restore-daemon/src/main.rs | 31 ++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/proxmox-restore-daemon/src/main.rs b/proxmox-restore-daemon/src/main.rs index 47790a7d..3555815f 100644 --- a/proxmox-restore-daemon/src/main.rs +++ b/proxmox-restore-daemon/src/main.rs @@ -36,6 +36,15 @@ lazy_static! { }; } +fn init_disk_state() { + info!("scanning all disks..."); + { + let _disk_state = DISK_STATE.lock().unwrap(); + } + + info!("disk scan complete.") +} + /// This is expected to be run by 'proxmox-file-restore' within a mini-VM fn main() -> Result<(), Error> { pbs_tools::setup_libc_malloc_opts(); @@ -56,15 +65,6 @@ fn main() -> Result<(), Error> { info!("setup basic system environment..."); setup_system_env().map_err(|err| format_err!("system environment setup failed: {}", err))?; - // scan all attached disks now, before starting the API - // this will panic and stop the VM if anything goes wrong - info!("scanning all disks..."); - { - let _disk_state = DISK_STATE.lock().unwrap(); - } - - info!("disk scan complete, starting main runtime..."); - proxmox_async::runtime::main(run()) } @@ -93,6 +93,13 @@ fn setup_system_env() -> Result<(), Error> { async fn run() -> Result<(), Error> { watchdog_init(); + let init_future = async move { + match tokio::time::timeout(std::time::Duration::from_secs(120), tokio::task::spawn_blocking(init_disk_state)).await { + Ok(res) => res.map_err(|err| format_err!("disk init failed: {}", err)), + Err(_) => bail!("disk init timed out after 120 seconds"), + } + }; + let adaptor = StaticAuthAdapter::new() .map_err(|err| format_err!("reading ticket file failed: {}", err))?; @@ -104,7 +111,11 @@ async fn run() -> Result<(), Error> { let receiver_stream = ReceiverStream::new(connections); let acceptor = hyper::server::accept::from_stream(receiver_stream); - hyper::Server::builder(acceptor).serve(rest_server).await?; + let hyper_future = async move { + hyper::Server::builder(acceptor).serve(rest_server).await.map_err(|err| format_err!("hyper finished with error: {}", err)) + }; + + tokio::try_join!(init_future, hyper_future)?; bail!("hyper server exited"); } -- 2.30.2