tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

prune: fix workerid issues

Browse Source 
properly encode the namespace as separate field both for manual prunes
and the job. fix the access checks as well now that the job doesn't use
the jobid as workerid anymore.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler
2022-05-16 11:00:56 +02:00
committed by Thomas Lamprecht
parent e13303fca6
commit 3697161800
3 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/server/prune_job.rs
View File

@ -104,14 +104,17 @@ pub fn do_prune_job(
let worker_type = job.jobtype().to_string();
let auth_id = auth_id.clone();
let worker_id = format!("{store}");
let upid_str = WorkerTask::new_thread(
&worker_type,
Some(job.jobname().to_string()),
Some(worker_id),
auth_id.to_string(),
false,
move |worker| {
job.start(&worker.upid().to_string())?;
task_log!(worker, "prune job '{}'", job.jobname());
if let Some(event_str) = schedule {
task_log!(worker, "task triggered by schedule '{}'", event_str);
}