From: Christian Ebner <c.ebner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 1/2] api: create default prune job on datastore creation
Date: Wed, 29 Nov 2023 12:36:36 +0100 [thread overview]
Message-ID: <20231129113637.204053-2-c.ebner@proxmox.com> (raw)
In-Reply-To: <20231129113637.204053-1-c.ebner@proxmox.com>
Create a default prune job when a datastore is created as part of a
disk/zpool creation transaction via e.g.:
`proxmox-backup-manager disk fs create <storage-name> --disk <block-device>
--add-datastore true`
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
Currently depends on this patch to apply:
https://lists.proxmox.com/pipermail/pbs-devel/2023-November/007336.html
I can send a v2 without this interdependecy if requested.
src/api2/node/disks/directory.rs | 25 +++++++++++++++++++++++--
src/api2/node/disks/zfs.rs | 27 ++++++++++++++++++++++++---
2 files changed, 47 insertions(+), 5 deletions(-)
diff --git a/src/api2/node/disks/directory.rs b/src/api2/node/disks/directory.rs
index af2e1a14..89260b8e 100644
--- a/src/api2/node/disks/directory.rs
+++ b/src/api2/node/disks/directory.rs
@@ -6,10 +6,11 @@ use proxmox_router::{Permission, Router, RpcEnvironment, RpcEnvironmentType};
use proxmox_schema::api;
use proxmox_section_config::SectionConfigData;
use proxmox_sys::task_log;
+use proxmox_uuid::Uuid;
use pbs_api_types::{
- DataStoreConfig, BLOCKDEVICE_NAME_SCHEMA, STORAGE_NAME_SCHEMA, NODE_SCHEMA, PRIV_SYS_AUDIT,
- PRIV_SYS_MODIFY, UPID_SCHEMA,
+ DataStoreConfig, KeepOptions, PruneJobConfig, PruneJobOptions, BLOCKDEVICE_NAME_SCHEMA,
+ NODE_SCHEMA, PRIV_SYS_AUDIT, PRIV_SYS_MODIFY, STORAGE_NAME_SCHEMA, UPID_SCHEMA,
};
use crate::tools::disks::{
@@ -210,6 +211,26 @@ pub fn create_datastore_disk(
datastore,
Some(&worker),
)?;
+
+ crate::api2::config::prune::do_create_prune_job(
+ PruneJobConfig {
+ id: {
+ let mut id = format!("default-{}-{}", name, Uuid::generate());
+ id.truncate(32);
+ id
+ },
+ store: name.clone(),
+ comment: None,
+ disable: false,
+ schedule: String::from("daily"),
+ options: PruneJobOptions {
+ keep: KeepOptions::default(),
+ max_depth: None,
+ ns: None,
+ },
+ },
+ Some(&worker),
+ )?;
}
Ok(())
diff --git a/src/api2/node/disks/zfs.rs b/src/api2/node/disks/zfs.rs
index e225b9a7..7bc46986 100644
--- a/src/api2/node/disks/zfs.rs
+++ b/src/api2/node/disks/zfs.rs
@@ -4,11 +4,12 @@ use serde_json::{json, Value};
use proxmox_router::{Permission, Router, RpcEnvironment, RpcEnvironmentType};
use proxmox_schema::api;
use proxmox_sys::{task_error, task_log};
+use proxmox_uuid::Uuid;
use pbs_api_types::{
- DataStoreConfig, ZfsCompressionType, ZfsRaidLevel, ZpoolListItem, STORAGE_NAME_SCHEMA,
- DISK_ARRAY_SCHEMA, DISK_LIST_SCHEMA, NODE_SCHEMA, PRIV_SYS_AUDIT, PRIV_SYS_MODIFY, UPID_SCHEMA,
- ZFS_ASHIFT_SCHEMA, ZPOOL_NAME_SCHEMA,
+ DataStoreConfig, KeepOptions, PruneJobConfig, PruneJobOptions, ZfsCompressionType,
+ ZfsRaidLevel, ZpoolListItem, DISK_ARRAY_SCHEMA, DISK_LIST_SCHEMA, NODE_SCHEMA, PRIV_SYS_AUDIT,
+ PRIV_SYS_MODIFY, STORAGE_NAME_SCHEMA, UPID_SCHEMA, ZFS_ASHIFT_SCHEMA, ZPOOL_NAME_SCHEMA,
};
use crate::tools::disks::{
@@ -325,6 +326,26 @@ pub fn create_zpool(
datastore,
Some(&worker),
)?;
+
+ crate::api2::config::prune::do_create_prune_job(
+ PruneJobConfig {
+ id: {
+ let mut id = format!("default-{}-{}", name, Uuid::generate());
+ id.truncate(32);
+ id
+ },
+ store: name.clone(),
+ comment: None,
+ disable: false,
+ schedule: String::from("daily"),
+ options: PruneJobOptions {
+ keep: KeepOptions::default(),
+ max_depth: None,
+ ns: None,
+ },
+ },
+ Some(&worker),
+ )?;
}
Ok(())
--
2.39.2
next prev parent reply other threads:[~2023-11-29 11:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-29 11:36 [pbs-devel] [PATCH proxmox-backup 0/2] add default prune job and gc-schedule Christian Ebner
2023-11-29 11:36 ` Christian Ebner [this message]
2023-11-29 13:27 ` [pbs-devel] [PATCH proxmox-backup 1/2] api: create default prune job on datastore creation Fabian Grünbichler
2023-11-29 13:31 ` Thomas Lamprecht
2023-11-29 13:54 ` Christian Ebner
2023-11-29 11:36 ` [pbs-devel] [PATCH proxmox-backup 2/2] api: create default garbage collection schedule Christian Ebner
2023-11-29 13:27 ` Fabian Grünbichler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231129113637.204053-2-c.ebner@proxmox.com \
--to=c.ebner@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox