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 1EF979C149 for ; Tue, 21 Nov 2023 17:21:50 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F3D28D637 for ; Tue, 21 Nov 2023 17:21:19 +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 ; Tue, 21 Nov 2023 17:21:19 +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 26F5641D4D for ; Tue, 21 Nov 2023 17:21:19 +0100 (CET) From: Stefan Lendl To: pbs-devel@lists.proxmox.com Date: Tue, 21 Nov 2023 17:21:11 +0100 Message-ID: <20231121162111.537833-4-s.lendl@proxmox.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231121162111.537833-1-s.lendl@proxmox.com> References: <20231121162111.537833-1-s.lendl@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.052 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 v2 proxmox-backup 3/3] fix #4374: create a prune job upon datastore creation 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: Tue, 21 Nov 2023 16:21:50 -0000 creates a default prune job if prune-schedule is set when creating the datastore. Auto generates a name for a prune-job with a truncated uuid to avoid collisions. Prune settings were stored in the datastore config but have no effect. Prune settings are not stored there anymore Signed-off-by: Stefan Lendl --- src/api2/config/datastore.rs | 49 +++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 9 deletions(-) diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs index 5e013c39..746a5c01 100644 --- a/src/api2/config/datastore.rs +++ b/src/api2/config/datastore.rs @@ -9,11 +9,12 @@ use proxmox_router::{http_bail, Permission, Router, RpcEnvironment, RpcEnvironme use proxmox_schema::{api, param_bail, ApiType}; use proxmox_section_config::SectionConfigData; use proxmox_sys::{task_warn, WorkerTaskContext}; +use proxmox_uuid::Uuid; use pbs_api_types::{ - Authid, DataStoreConfig, DataStoreConfigUpdater, DatastoreNotify, DatastoreTuning, - DATASTORE_SCHEMA, PRIV_DATASTORE_ALLOCATE, PRIV_DATASTORE_AUDIT, PRIV_DATASTORE_MODIFY, - PROXMOX_CONFIG_DIGEST_SCHEMA, UPID_SCHEMA, + Authid, DataStoreConfig, DataStoreConfigUpdater, DatastoreNotify, DatastoreTuning, KeepOptions, + PruneJobConfig, PruneJobOptions, DATASTORE_SCHEMA, PRIV_DATASTORE_ALLOCATE, + PRIV_DATASTORE_AUDIT, PRIV_DATASTORE_MODIFY, PROXMOX_CONFIG_DIGEST_SCHEMA, UPID_SCHEMA, }; use pbs_config::BackupLockGuard; use pbs_datastore::chunk_store::ChunkStore; @@ -21,7 +22,7 @@ use pbs_datastore::chunk_store::ChunkStore; 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::prune::{delete_prune_job, do_create_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; @@ -91,10 +92,7 @@ pub(crate) fn do_create_datastore( pbs_config::datastore::save_config(&config)?; - jobstate::create_state_file("prune", &datastore.name)?; - jobstate::create_state_file("garbage_collection", &datastore.name)?; - - Ok(()) + jobstate::create_state_file("garbage_collection", &datastore.name) } #[api( @@ -127,12 +125,45 @@ pub fn create_datastore( let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI; + let prune_job_config = config.prune_schedule.as_ref().and_then(|schedule| { + let mut id = format!("default-{}-{}", config.name, Uuid::generate()); + id.truncate(32); + + Some(PruneJobConfig { + id, + store: config.name.clone(), + comment: None, + disable: false, + schedule: schedule.clone(), + options: PruneJobOptions { + keep: config.keep.clone(), + max_depth: None, + ns: None, + }, + }) + }); + + // clearing prune settings in the datastore config, as they are now handled by prune jobs + let config = DataStoreConfig { + prune_schedule: None, + keep: KeepOptions::default(), + ..config + }; + WorkerTask::new_thread( "create-datastore", Some(config.name.to_string()), auth_id.to_string(), to_stdout, - move |worker| do_create_datastore(lock, section_config, config, Some(&worker)), + move |worker| { + do_create_datastore(lock, section_config, config, Some(&worker))?; + + if let Some(prune_job_config) = prune_job_config { + do_create_prune_job(prune_job_config, Some(&worker)) + } else { + Ok(()) + } + }, ) } -- 2.42.0