[pbs-devel] [PATCH v2 proxmox-backup 27/31] datastore: move `BackupGroupDeleteStats` to api types

[Fabian Grünbichler]

Quoting Christian Ebner (2024-08-01 09:43:59)
> In preparation for the delete stats to be exposed as return type to
> the backup group delete api endpoint.
> 
> Signed-off-by: Christian Ebner <c.ebner at proxmox.com>
> ---
> changes since version 1:
> - not present in previous version
> 
>  pbs-api-types/src/datastore.rs   | 30 +++++++++++++++++++++++++++++
>  pbs-datastore/src/backup_info.rs | 33 ++------------------------------
>  pbs-datastore/src/datastore.rs   |  7 ++++---
>  3 files changed, 36 insertions(+), 34 deletions(-)
> 
> diff --git a/pbs-api-types/src/datastore.rs b/pbs-api-types/src/datastore.rs
> index 31767417a..82998acd4 100644
> --- a/pbs-api-types/src/datastore.rs
> +++ b/pbs-api-types/src/datastore.rs
> @@ -1569,3 +1569,33 @@ pub fn print_store_and_ns(store: &str, ns: &BackupNamespace) -> String {
>          format!("datastore '{}', namespace '{}'", store, ns)
>      }
>  }
> +
> +#[derive(Default)]
> +pub struct BackupGroupDeleteStats {
> +    // Count of protected snapshots, therefore not removed
> +    unremoved_protected: usize,

why not just protected? or "protected_snapshots"? "unremoved" is a really weird word ;)

> +    // Count of deleted snapshots
> +    removed_snapshots: usize,
> +}
> +
> +impl BackupGroupDeleteStats {
> +    pub fn all_removed(&self) -> bool {
> +        self.unremoved_protected == 0
> +    }
> +
> +    pub fn removed_snapshots(&self) -> usize {
> +        self.removed_snapshots
> +    }
> +
> +    pub fn protected_snapshots(&self) -> usize {
> +        self.unremoved_protected
> +    }
> +
> +    pub fn increment_removed_snapshots(&mut self) {
> +        self.removed_snapshots += 1;
> +    }
> +
> +    pub fn increment_protected_snapshots(&mut self) {
> +        self.unremoved_protected += 1;
> +    }
> +}
> diff --git a/pbs-datastore/src/backup_info.rs b/pbs-datastore/src/backup_info.rs
> index 414ec878d..222134074 100644
> --- a/pbs-datastore/src/backup_info.rs
> +++ b/pbs-datastore/src/backup_info.rs
> @@ -8,7 +8,8 @@ use anyhow::{bail, format_err, Error};
>  use proxmox_sys::fs::{lock_dir_noblock, replace_file, CreateOptions};
>  
>  use pbs_api_types::{
> -    Authid, BackupNamespace, BackupType, GroupFilter, BACKUP_DATE_REGEX, BACKUP_FILE_REGEX,
> +    Authid, BackupGroupDeleteStats, BackupNamespace, BackupType, GroupFilter, BACKUP_DATE_REGEX,
> +    BACKUP_FILE_REGEX,
>  };
>  use pbs_config::{open_backup_lockfile, BackupLockGuard};
>  
> @@ -17,36 +18,6 @@ use crate::manifest::{
>  };
>  use crate::{DataBlob, DataStore};
>  
> -#[derive(Default)]
> -pub struct BackupGroupDeleteStats {
> -    // Count of protected snapshots, therefore not removed
> -    unremoved_protected: usize,
> -    // Count of deleted snapshots
> -    removed_snapshots: usize,
> -}
> -
> -impl BackupGroupDeleteStats {
> -    pub fn all_removed(&self) -> bool {
> -        self.unremoved_protected == 0
> -    }
> -
> -    pub fn removed_snapshots(&self) -> usize {
> -        self.removed_snapshots
> -    }
> -
> -    pub fn protected_snapshots(&self) -> usize {
> -        self.unremoved_protected
> -    }
> -
> -    fn increment_removed_snapshots(&mut self) {
> -        self.removed_snapshots += 1;
> -    }
> -
> -    fn increment_protected_snapshots(&mut self) {
> -        self.unremoved_protected += 1;
> -    }
> -}
> -
>  /// BackupGroup is a directory containing a list of BackupDir
>  #[derive(Clone)]
>  pub struct BackupGroup {
> diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs
> index d6218fb48..a97af24ef 100644
> --- a/pbs-datastore/src/datastore.rs
> +++ b/pbs-datastore/src/datastore.rs
> @@ -19,11 +19,12 @@ use proxmox_sys::process_locker::ProcessLockSharedGuard;
>  use proxmox_worker_task::WorkerTaskContext;
>  
>  use pbs_api_types::{
> -    Authid, BackupNamespace, BackupType, ChunkOrder, DataStoreConfig, DatastoreFSyncLevel,
> -    DatastoreTuning, GarbageCollectionStatus, MaintenanceMode, MaintenanceType, Operation, UPID,
> +    Authid, BackupGroupDeleteStats, BackupNamespace, BackupType, ChunkOrder, DataStoreConfig,
> +    DatastoreFSyncLevel, DatastoreTuning, GarbageCollectionStatus, MaintenanceMode,
> +    MaintenanceType, Operation, UPID,
>  };
>  
> -use crate::backup_info::{BackupDir, BackupGroup, BackupGroupDeleteStats};
> +use crate::backup_info::{BackupDir, BackupGroup};
>  use crate::chunk_store::ChunkStore;
>  use crate::dynamic_index::{DynamicIndexReader, DynamicIndexWriter};
>  use crate::fixed_index::{FixedIndexReader, FixedIndexWriter};
> -- 
> 2.39.2
> 
> 
> 
> _______________________________________________
> pbs-devel mailing list
> pbs-devel at lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
> 
>