Re: [pbs-devel] [PATCH proxmox-backup 03/12] add protected info of snapshots to api and task logs

["Fabian Grünbichler" <f.gruenbichler@proxmox.com>]

On September 6, 2021 12:57 pm, Dominik Csapak wrote:
> adds the info that a snapshot is protected to:
> * snapshot list
> * manual pruning (also dry-run)
> * prune jobs
> 
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
>  pbs-api-types/src/lib.rs    |  2 ++
>  pbs-datastore/src/prune.rs  | 11 +++++++----
>  src/api2/admin/datastore.rs | 11 ++++++++---
>  src/server/prune_job.rs     |  4 ++--
>  4 files changed, 19 insertions(+), 9 deletions(-)
> 
> diff --git a/pbs-api-types/src/lib.rs b/pbs-api-types/src/lib.rs
> index 427b2d9f..eba68ce5 100644
> --- a/pbs-api-types/src/lib.rs
> +++ b/pbs-api-types/src/lib.rs
> @@ -411,6 +411,8 @@ pub struct SnapshotListItem {
>      /// The owner of the snapshots group
>      #[serde(skip_serializing_if = "Option::is_none")]
>      pub owner: Option<Authid>,
> +    /// Protection from prunes
> +    pub protected: bool,
>  }
>  
>  #[api(
> diff --git a/pbs-datastore/src/prune.rs b/pbs-datastore/src/prune.rs
> index 6b76e9d7..6b9c2bbb 100644
> --- a/pbs-datastore/src/prune.rs
> +++ b/pbs-datastore/src/prune.rs
> @@ -225,7 +225,7 @@ impl PruneOptions {
>  pub fn compute_prune_info(
>      mut list: Vec<BackupInfo>,
>      options: &PruneOptions,
> -) -> Result<Vec<(BackupInfo, bool)>, Error> {
> +) -> Result<Vec<(BackupInfo, bool, bool)>, Error> {

starting to get into territory where a PruneInfo type might make 
sense..

alternatively, maybe the PruneMark enum could be re-used instead of two 
bools? with serializing as

keep
keep-partial
protected
remove

it would also work as return type instead of the conversion into "keep 
(protected)" below, IMHO that protected implies keep is a given as that is the 
only reason to set protected in the first place ^^

>  
>      let mut mark = HashMap::new();
>  
> @@ -273,15 +273,18 @@ pub fn compute_prune_info(
>          })?;
>      }
>  
> -    let prune_info: Vec<(BackupInfo, bool)> = list.into_iter()
> +    let prune_info: Vec<(BackupInfo, bool, bool)> = list.into_iter()
>          .map(|info| {
>              let backup_id = info.backup_dir.relative_path();
> +            let protected = info.protected;
>              let keep = match mark.get(&backup_id) {
>                  Some(PruneMark::Keep) => true,
>                  Some(PruneMark::KeepPartial) => true,
> -               _ => false,
> +                Some(PruneMark::Protected) => true,
> +               _ => if protected { true } else { false },
>              };
> -            (info, keep)
> +
> +            (info, keep, protected)
>          })
>          .collect();
>  
> diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs
> index 5470de73..f49cdbee 100644
> --- a/src/api2/admin/datastore.rs
> +++ b/src/api2/admin/datastore.rs
> @@ -444,6 +444,7 @@ pub fn list_snapshots (
>          let backup_type = group.backup_type().to_string();
>          let backup_id = group.backup_id().to_string();
>          let backup_time = info.backup_dir.backup_time();
> +        let protected = info.backup_dir.is_protected(base_path.clone());
>  
>          match get_all_snapshot_files(&datastore, &info) {
>              Ok((manifest, files)) => {
> @@ -482,6 +483,7 @@ pub fn list_snapshots (
>                      files,
>                      size,
>                      owner,
> +                    protected,
>                  }
>              },
>              Err(err) => {
> @@ -506,6 +508,7 @@ pub fn list_snapshots (
>                      files,
>                      size: None,
>                      owner,
> +                    protected,
>                  }
>              },
>          }
> @@ -849,7 +852,7 @@ pub fn prune(
>      let keep_all = !prune_options.keeps_something();
>  
>      if dry_run {
> -        for (info, mut keep) in prune_info {
> +        for (info, mut keep, protected) in prune_info {
>              if keep_all { keep = true; }
>  
>              let backup_time = info.backup_dir.backup_time();
> @@ -860,6 +863,7 @@ pub fn prune(
>                  "backup-id": group.backup_id(),
>                  "backup-time": backup_time,
>                  "keep": keep,
> +                "protected": protected,
>              }));
>          }
>          return Ok(json!(prune_result));
> @@ -877,7 +881,7 @@ pub fn prune(
>                              store, backup_type, backup_id));
>      }
>  
> -    for (info, mut keep) in prune_info {
> +    for (info, mut keep, protected) in prune_info {
>          if keep_all { keep = true; }
>  
>          let backup_time = info.backup_dir.backup_time();
> @@ -890,7 +894,7 @@ pub fn prune(
>              group.backup_type(),
>              group.backup_id(),
>              timestamp,
> -            if keep { "keep" } else { "remove" },
> +            if keep { if protected { "keep (protected)" } else { "keep" } } else { "remove" },
>          );
>  
>          worker.log(msg);
> @@ -900,6 +904,7 @@ pub fn prune(
>              "backup-id": group.backup_id(),
>              "backup-time": backup_time,
>              "keep": keep,
> +            "protected": protected,
>          }));
>  
>          if !(dry_run || keep) {
> diff --git a/src/server/prune_job.rs b/src/server/prune_job.rs
> index 2ea8b713..bfe2bd9e 100644
> --- a/src/server/prune_job.rs
> +++ b/src/server/prune_job.rs
> @@ -66,12 +66,12 @@ pub fn prune_datastore(
>              group.backup_id()
>          );
>  
> -        for (info, mut keep) in prune_info {
> +        for (info, mut keep, protected) in prune_info {
>              if keep_all { keep = true; }
>              task_log!(
>                  worker,
>                  "{} {}/{}/{}",
> -                if keep { "keep" } else { "remove" },
> +                if keep { if protected { "keep (protected)" } else { "keep" } } else { "remove" },
>                  group.backup_type(),
>                  group.backup_id(),
>                  info.backup_dir.backup_time_string()
> -- 
> 2.30.2
> 
> 
> 
> _______________________________________________
> pbs-devel mailing list
> pbs-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
> 
> 
>