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 A2CDE741EE 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 9860F16CE7 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 00A5316CDB for ; Thu, 8 Jul 2021 12:13:51 +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 C8AE540F1D; 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:48 +0200 Message-Id: <20210708101349.2693257-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.659 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] Subject: [pbs-devel] [PATCH proxmox-backup 1/2] api2: add keep-job-configs flag to datastore remove endpoint 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 From: Hannes Laimer Signed-off-by: Hannes Laimer Suggested Fixes: Signed-off-by: Dominik Csapak --- changes from Hannes' v1: * rebased on master * i fixed the wrong function call (config vs admin) * changed 'keep_job_configs' to a bool (from an option) since it has a default src/api2/config/datastore.rs | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs index d083d0c4..1fde362a 100644 --- a/src/api2/config/datastore.rs +++ b/src/api2/config/datastore.rs @@ -10,6 +10,12 @@ use proxmox::api::schema::parse_property_string; use pbs_datastore::task::TaskState; +use crate::api2::config::sync::delete_sync_job; +use crate::api2::config::verify::delete_verification_job; +use crate::api2::admin::{ + sync::list_sync_jobs, + verify::list_verification_jobs, +}; use crate::api2::types::*; use crate::backup::*; use crate::config::cached_user_info::CachedUserInfo; @@ -413,6 +419,12 @@ pub fn update_datastore( name: { schema: DATASTORE_SCHEMA, }, + "keep-job-configs": { + description: "If enabled, the job configurations related to this datastore will be kept.", + type: bool, + optional: true, + default: false, + }, digest: { optional: true, schema: PROXMOX_CONFIG_DIGEST_SCHEMA, @@ -424,7 +436,12 @@ pub fn update_datastore( }, )] /// Remove a datastore configuration. -pub async fn delete_datastore(name: String, digest: Option) -> Result<(), Error> { +pub async fn delete_datastore( + name: String, + keep_job_configs: bool, + digest: Option, + rpcenv: &mut dyn RpcEnvironment, +) -> Result<(), Error> { let _lock = datastore::lock_config()?; @@ -440,6 +457,15 @@ pub async fn delete_datastore(name: String, digest: Option) -> Result<() None => bail!("datastore '{}' does not exist.", name), } + if !keep_job_configs { + for job in list_verification_jobs(Some(name.clone()), Value::Null, rpcenv)? { + delete_verification_job(job.config.id, None, rpcenv)? + } + for job in list_sync_jobs(Some(name.clone()), Value::Null, rpcenv)? { + delete_sync_job(job.config.id, None, rpcenv)? + } + } + datastore::save_config(&config)?; // ignore errors -- 2.30.2