From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [RFC proxmox v2 3/4] rest-server: make worker task creation error handling more idiomatic
Date: Mon, 2 Dec 2024 14:04:11 +0100 [thread overview]
Message-ID: <20241202130412.1290616-4-f.gruenbichler@proxmox.com> (raw)
In-Reply-To: <20241202130412.1290616-1-f.gruenbichler@proxmox.com>
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
Notes:
best I could come up with ;) feel free to fold that one in
proxmox-rest-server/src/worker_task.rs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/proxmox-rest-server/src/worker_task.rs b/proxmox-rest-server/src/worker_task.rs
index bbf82ff9..74828855 100644
--- a/proxmox-rest-server/src/worker_task.rs
+++ b/proxmox-rest-server/src/worker_task.rs
@@ -928,10 +928,10 @@ impl WorkerTask {
if res.is_err() {
// needed to undo the insertion into WORKER_TASK_LIST above
worker.log_result(&res);
- res?
+ Err(res.unwrap_err())
+ } else {
+ Ok((worker, logger))
}
-
- Ok((worker, logger))
}
/// Spawn a new tokio task/future.
--
2.39.5
_______________________________________________
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-12-02 13:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-02 13:04 [pbs-devel] [PATCH proxmox v2 0/4] worker task setup improvements Fabian Grünbichler
2024-12-02 13:04 ` [pbs-devel] [PATCH proxmox v2 1/4] rest-server: handle failure in worker task setup correctly Fabian Grünbichler
2024-12-02 15:57 ` [pbs-devel] applied: " Thomas Lamprecht
2024-12-02 13:04 ` [pbs-devel] [PATCH proxmox v2 2/4] rest-server: close race window when updating worker task count Fabian Grünbichler
2024-12-02 15:57 ` [pbs-devel] applied: " Thomas Lamprecht
2024-12-02 13:04 ` Fabian Grünbichler [this message]
2024-12-02 15:58 ` [pbs-devel] [RFC proxmox v2 3/4] rest-server: make worker task creation error handling more idiomatic Thomas Lamprecht
2024-12-02 13:04 ` [pbs-devel] [RFC proxmox v2 4/4] rest-server: increase task index lock timeout to 15s Fabian Grünbichler
2024-12-02 15:59 ` [pbs-devel] applied: " Thomas Lamprecht
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=20241202130412.1290616-4-f.gruenbichler@proxmox.com \
--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