From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox 1/2] rest-server: handle failure in worker task setup correctly
Date: Fri, 29 Nov 2024 14:13:28 +0100 [thread overview]
Message-ID: <20241129131329.765815-2-f.gruenbichler@proxmox.com> (raw)
In-Reply-To: <20241129131329.765815-1-f.gruenbichler@proxmox.com>
if setting up a new worker fails after it has been inserted into the
WORKER_TASK_LIST, we need to clean it up instead of bubbling up the error right
away, else we "leak" the worker task and it never finishes..
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
we probably want to optimize update_active_workers as well to reduce the lock
contention there that triggers this issue in the first place..
proxmox-rest-server/src/worker_task.rs | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/proxmox-rest-server/src/worker_task.rs b/proxmox-rest-server/src/worker_task.rs
index 6e76c2ca..3ca93965 100644
--- a/proxmox-rest-server/src/worker_task.rs
+++ b/proxmox-rest-server/src/worker_task.rs
@@ -923,7 +923,12 @@ impl WorkerTask {
set_worker_count(hash.len());
}
- setup.update_active_workers(Some(&upid))?;
+ let res = setup.update_active_workers(Some(&upid));
+ if res.is_err() {
+ // needed to undo the insertion into WORKER_TASK_LIST above
+ worker.log_result(&res);
+ res?
+ }
Ok((worker, logger))
}
--
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-11-29 13:14 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-29 13:13 [pbs-devel] [RFC proxmox 0/2] worker task setup improvements Fabian Grünbichler
2024-11-29 13:13 ` Fabian Grünbichler [this message]
2024-11-29 13:34 ` [pbs-devel] [PATCH proxmox 1/2] rest-server: handle failure in worker task setup correctly Thomas Lamprecht
2024-12-02 9:14 ` Fabian Grünbichler
2024-11-29 13:13 ` [pbs-devel] [PATCH proxmox 2/2] rest-server: close race window when updating worker task count Fabian Grünbichler
2024-11-29 13:27 ` Thomas Lamprecht
2024-11-29 14:20 ` Dominik Csapak
2024-12-02 9:14 ` Fabian Grünbichler
2024-11-29 14:53 ` [pbs-devel] [RFC proxmox 0/2] worker task setup improvements Dominik Csapak
2024-12-02 13:04 ` [pbs-devel] superseded: " 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=20241129131329.765815-2-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