[pbs-devel] [PATCH proxmox-backup 1/2] api: create default prune job on datastore creation

[Fabian Grünbichler]

On November 29, 2023 12:36 pm, Christian Ebner wrote:
> 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`

is this documented anywhere?

`proxmox-backup-manager datastore create ..` does not add any
schedules/jobs by default, it's just the web UI that does (but that also
tells you about this, and allows you to override it!)

I agree that it probably makes sense, but it should be consistent
- web UI does it, but then it should display it (and it would need to
  become a new optional parameter here, maybe by extending
  "add_datastore", else overriding would not be possible)
- proxmox-backup-manager does it, but then it should also do it for a
  "plain" datastore creation by default?

> Signed-off-by: Christian Ebner <c.ebner at 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
> 
> 
> 
> _______________________________________________
> pbs-devel mailing list
> pbs-devel at lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
> 
> 
>