[pbs-devel] [PATCH proxmox 1/2] rest-server: handle failure in worker task setup correctly
Fabian Grünbichler
f.gruenbichler at proxmox.com
Fri Nov 29 14:13:28 CET 2024
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 at 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
More information about the pbs-devel
mailing list