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 76D7E91017 for ; Tue, 13 Feb 2024 13:44:02 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 50057362F0 for ; Tue, 13 Feb 2024 13:43:32 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 13 Feb 2024 13:43:30 +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 865B447D84 for ; Tue, 13 Feb 2024 13:43:30 +0100 (CET) From: Maximiliano Sandoval To: pbs-devel@lists.proxmox.com Date: Tue, 13 Feb 2024 13:43:28 +0100 Message-Id: <20240213124329.411737-1-m.sandoval@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.031 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 FSL_BULK_SIG 0.001 Bulk signature with no Unsubscribe KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RAZOR2_CF_RANGE_51_100 1.886 Razor2 gives confidence level above 50% RAZOR2_CHECK 0.922 Listed in Razor2 (http://razor.sf.net/) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [github.io, proxmox-backup-proxy.rs] URIBL_SBL_A 0.1 Contains URL's A record listed in the Spamhaus SBL blocklist [185.199.109.153, 185.199.108.153, 185.199.110.153, 185.199.111.153] Subject: [pbs-devel] [PATCH backup v3 1/2] backup-proxy: avoid block in if condition 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: Tue, 13 Feb 2024 12:44:02 -0000 Fixes the clippy lint: ``` warning: in a `match` scrutinee, avoid complex blocks or closures with blocks; instead, move the block or closure higher and bind it with a `let` --> src/bin/proxmox-backup-proxy.rs:874:58 | 874 | let stats = match tokio::task::spawn_blocking(|| { | __________________________________________________________^ 875 | | let hoststats = collect_host_stats_sync(); 876 | | let (hostdisk, datastores) = collect_disk_stats_sync(); 877 | | Arc::new((hoststats, hostdisk, datastores)) 878 | | }) | |_________^ | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#blocks_in_conditions = note: `#[warn(clippy::blocks_in_conditions)]` on by default ``` Signed-off-by: Maximiliano Sandoval --- Differences from v2: - Rename stats_res to stats_fut - Port other uses of single branched `match` to if-let src/bin/proxmox-backup-proxy.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-proxy.rs index 9c49026b..a2c48f16 100644 --- a/src/bin/proxmox-backup-proxy.rs +++ b/src/bin/proxmox-backup-proxy.rs @@ -871,13 +871,12 @@ async fn run_stat_generator() { loop { let delay_target = Instant::now() + Duration::from_secs(10); - let stats = match tokio::task::spawn_blocking(|| { + let stats_fut = tokio::task::spawn_blocking(|| { let hoststats = collect_host_stats_sync(); let (hostdisk, datastores) = collect_disk_stats_sync(); Arc::new((hoststats, hostdisk, datastores)) - }) - .await - { + }); + let stats = match stats_fut.await { Ok(res) => res, Err(err) => { log::error!("collecting host stats panicked: {err}"); -- 2.39.2