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 767D774284 for ; Thu, 8 Jul 2021 12:14:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6362A16CE6 for ; Thu, 8 Jul 2021 12:13:51 +0200 (CEST) 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 id CBC5C16CD1 for ; Thu, 8 Jul 2021 12:13:50 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 9979940F21 for ; Thu, 8 Jul 2021 12:13:50 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Thu, 8 Jul 2021 12:13:49 +0200 Message-Id: <20210708101349.2693257-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210708101349.2693257-1-d.csapak@proxmox.com> References: <20210708101349.2693257-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.661 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [datastore.rs, setup.store] Subject: [pbs-devel] [PATCH proxmox-backup 2/2] api2/config/datastore: delete_datastore: also remove tape backup jobs 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: Thu, 08 Jul 2021 10:14:21 -0000 Signed-off-by: Dominik Csapak --- src/api2/config/datastore.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs index 1fde362a..19b822d4 100644 --- a/src/api2/config/datastore.rs +++ b/src/api2/config/datastore.rs @@ -12,6 +12,7 @@ use pbs_datastore::task::TaskState; use crate::api2::config::sync::delete_sync_job; use crate::api2::config::verify::delete_verification_job; +use crate::api2::config::tape_backup_job::{list_tape_backup_jobs, delete_tape_backup_job}; use crate::api2::admin::{ sync::list_sync_jobs, verify::list_verification_jobs, @@ -464,6 +465,11 @@ 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)? } + + let tape_jobs = list_tape_backup_jobs(Value::Null, rpcenv)?; + for job_config in tape_jobs.into_iter().filter(|config| config.setup.store == name) { + delete_tape_backup_job(job_config.id, None, rpcenv)?; + } } datastore::save_config(&config)?; -- 2.30.2