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 B97E790DA2 for ; Mon, 19 Dec 2022 15:13:33 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9714928924 for ; Mon, 19 Dec 2022 15:13:33 +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 ; Mon, 19 Dec 2022 15:13:32 +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 2211A44757 for ; Mon, 19 Dec 2022 15:13:32 +0100 (CET) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Mon, 19 Dec 2022 15:13:23 +0100 Message-Id: <20221219141326.201199-2-h.laimer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221219141326.201199-1-h.laimer@proxmox.com> References: <20221219141326.201199-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.035 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 Subject: [pbs-devel] [PATCH proxmox-backup 1/4] fix #4256: api2: remove prune jobs on datastore delete 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: Mon, 19 Dec 2022 14:13:33 -0000 Signed-off-by: Hannes Laimer --- src/api2/config/datastore.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs index b6679f2f..27489590 100644 --- a/src/api2/config/datastore.rs +++ b/src/api2/config/datastore.rs @@ -18,7 +18,10 @@ use pbs_api_types::{ use pbs_config::BackupLockGuard; use pbs_datastore::chunk_store::ChunkStore; -use crate::api2::admin::{sync::list_sync_jobs, verify::list_verification_jobs}; +use crate::api2::admin::{ + prune::list_prune_jobs, sync::list_sync_jobs, verify::list_verification_jobs, +}; +use crate::api2::config::prune::delete_prune_job; use crate::api2::config::sync::delete_sync_job; use crate::api2::config::tape_backup_job::{delete_tape_backup_job, list_tape_backup_jobs}; use crate::api2::config::verify::delete_verification_job; @@ -433,6 +436,9 @@ pub async fn delete_datastore( for job in list_sync_jobs(Some(name.clone()), Value::Null, rpcenv)? { delete_sync_job(job.config.id, None, rpcenv)? } + for job in list_prune_jobs(Some(name.clone()), Value::Null, rpcenv)? { + delete_prune_job(job.config.id, None, rpcenv)? + } let tape_jobs = list_tape_backup_jobs(Value::Null, rpcenv)?; for job_config in tape_jobs -- 2.30.2