From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pbs-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id 0454E1FF15C
for <inbox@lore.proxmox.com>; Wed, 7 Aug 2024 13:00:06 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 331F44DFF;
Wed, 7 Aug 2024 13:00:15 +0200 (CEST)
MIME-Version: 1.0
In-Reply-To: <20240801074403.36229-28-c.ebner@proxmox.com>
References: <20240801074403.36229-1-c.ebner@proxmox.com>
<20240801074403.36229-28-c.ebner@proxmox.com>
From: Fabian =?utf-8?q?Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
To: Christian Ebner <c.ebner@proxmox.com>, pbs-devel@lists.proxmox.com
Date: Wed, 07 Aug 2024 13:00:05 +0200
Message-ID: <172302840567.107519.2308163825106706482@yuna.proxmox.com>
User-Agent: alot/0.10
X-SPAM-LEVEL: Spam detection results: 0
AWL -1.252 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
ENA_SUBJ_ODD_CASE 2.6 Subject has odd case
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [datastore.rs, proxmox.com]
Subject: Re: [pbs-devel] [PATCH v2 proxmox-backup 27/31] datastore: move
`BackupGroupDeleteStats` to api types
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pbs-devel-bounces@lists.proxmox.com
Sender: "pbs-devel" <pbs-devel-bounces@lists.proxmox.com>
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@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@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
>
>
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel