From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 794EB90642 for ; Wed, 24 Jan 2024 11:35:34 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4CB62A313 for ; Wed, 24 Jan 2024 11:35:04 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 24 Jan 2024 11:35:03 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 6A50D49252 for ; Wed, 24 Jan 2024 11:35:03 +0100 (CET) From: Gabriel Goller To: pbs-devel@lists.proxmox.com Date: Wed, 24 Jan 2024 11:34:57 +0100 Message-ID: <20240124103459.74843-1-g.goller@proxmox.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.139 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH proxmox-backup] api: make prune-group a real workertask X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jan 2024 10:35:34 -0000 `prune-group` is currently not a real workertask, ie it behaves like one but doesn't start a thread nor a task to do its work. Changed it to start a tokio-task, so that we can delete snapshots asynchronously. The `dry-run` feature still behaves in the same way and returns early. This paves the way for the new logging infra (which uses `task_local` to define a logger) and improves performance of bigger backup-groups. Signed-off-by: Gabriel Goller --- src/api2/admin/datastore.rs | 104 ++++++++++++++++++------------------ 1 file changed, 53 insertions(+), 51 deletions(-) diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs index a95031e7..4801eb1a 100644 --- a/src/api2/admin/datastore.rs +++ b/src/api2/admin/datastore.rs @@ -1007,62 +1007,64 @@ pub fn prune( } return Ok(json!(prune_result)); } + let upid = WorkerTask::spawn( + "prune", + Some(worker_id), + auth_id.to_string(), + true, + move |worker| async move { + if keep_all { + task_log!(worker, "No prune selection - keeping all files."); + } else { + let mut opts = Vec::new(); + if !ns.is_root() { + opts.push(format!("--ns {ns}")); + } + crate::server::cli_keep_options(&mut opts, &keep_options); - // We use a WorkerTask just to have a task log, but run synchrounously - let worker = WorkerTask::new("prune", Some(worker_id), auth_id.to_string(), true)?; - - if keep_all { - task_log!(worker, "No prune selection - keeping all files."); - } else { - let mut opts = Vec::new(); - if !ns.is_root() { - opts.push(format!("--ns {ns}")); - } - crate::server::cli_keep_options(&mut opts, &keep_options); - - task_log!(worker, "retention options: {}", opts.join(" ")); - task_log!( - worker, - "Starting prune on {} group \"{}\"", - print_store_and_ns(&store, &ns), - group.group(), - ); - } - - for (info, mark) in prune_info { - let keep = keep_all || mark.keep(); - - let backup_time = info.backup_dir.backup_time(); - let timestamp = info.backup_dir.backup_time_string(); - let group: &pbs_api_types::BackupGroup = info.backup_dir.as_ref(); - - let msg = format!("{}/{}/{} {}", group.ty, group.id, timestamp, mark,); - - task_log!(worker, "{}", msg); - - prune_result.push(json!({ - "backup-type": group.ty, - "backup-id": group.id, - "backup-time": backup_time, - "keep": keep, - "protected": mark.protected(), - })); - - if !(dry_run || keep) { - if let Err(err) = info.backup_dir.destroy(false) { - task_warn!( + task_log!(worker, "retention options: {}", opts.join(" ")); + task_log!( worker, - "failed to remove dir {:?}: {}", - info.backup_dir.relative_path(), - err, + "Starting prune on {} group \"{}\"", + print_store_and_ns(&store, &ns), + group.group(), ); } - } - } - worker.log_result(&Ok(())); - - Ok(json!(prune_result)) + for (info, mark) in prune_info { + let keep = keep_all || mark.keep(); + + let backup_time = info.backup_dir.backup_time(); + let timestamp = info.backup_dir.backup_time_string(); + let group: &pbs_api_types::BackupGroup = info.backup_dir.as_ref(); + + let msg = format!("{}/{}/{} {}", group.ty, group.id, timestamp, mark,); + + task_log!(worker, "{}", msg); + + prune_result.push(json!({ + "backup-type": group.ty, + "backup-id": group.id, + "backup-time": backup_time, + "keep": keep, + "protected": mark.protected(), + })); + + if !(dry_run || keep) { + if let Err(err) = info.backup_dir.destroy(false) { + task_warn!( + worker, + "failed to remove dir {:?}: {}", + info.backup_dir.relative_path(), + err, + ); + } + } + } + Ok(()) + }, + )?; + Ok(json!(upid)) } #[api( -- 2.43.0