From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>
Subject: Re: [pbs-devel] [PATCH backup 2/4] backup-proxy: avoid block in if condition
Date: Tue, 13 Feb 2024 11:29:56 +0100 [thread overview]
Message-ID: <1707820127.h18zlfv62d.astroid@yuna.none> (raw)
In-Reply-To: <20240213095320.186188-2-m.sandoval@proxmox.com>
On February 13, 2024 10:53 am, Maximiliano Sandoval wrote:
> 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 <m.sandoval@proxmox.com>
> ---
> 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..b6e1fdd7 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_res = tokio::task::spawn_blocking(|| {
nit: called _res , but this is actually the future.. either stats_future, or await it
directly instead of below.
it could also be somewhat simplified by doing
match stats_res {
Ok(stats) => { // do all the broadcasting here },
Err(err) => { // log error here },
};
// sleep here
but that also increases the level of nesting for the broadcasting part,
so it's not a 100% win ;)
> let hoststats = collect_host_stats_sync();
> let (hostdisk, datastores) = collect_disk_stats_sync();
> Arc::new((hoststats, hostdisk, datastores))
> - })
> - .await
> - {
> + });
> + let stats = match stats_res.await {
> Ok(res) => res,
> Err(err) => {
> log::error!("collecting host stats panicked: {err}");
> --
> 2.39.2
>
>
>
> _______________________________________________
> pbs-devel mailing list
> pbs-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
>
>
>
next prev parent reply other threads:[~2024-02-13 10:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-13 9:53 [pbs-devel] [PATCH backup 1/4] disks: remove useless conversion to the same type Maximiliano Sandoval
2024-02-13 9:53 ` [pbs-devel] [PATCH backup 2/4] backup-proxy: avoid block in if condition Maximiliano Sandoval
2024-02-13 10:29 ` Fabian Grünbichler [this message]
2024-02-13 9:53 ` [pbs-devel] [PATCH backup 3/4] report: inline errors in writeln! Maximiliano Sandoval
2024-02-13 9:53 ` [pbs-devel] [PATCH backup 4/4] api: use if-let pattern for error-only handling Maximiliano Sandoval
2024-02-13 10:26 ` Fabian Grünbichler
2024-02-13 10:30 ` [pbs-devel] partially-applied: [PATCH backup 1/4] disks: remove useless conversion to the same type Fabian Grünbichler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1707820127.h18zlfv62d.astroid@yuna.none \
--to=f.gruenbichler@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox