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 [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id 6D1A71FF164
for <inbox@lore.proxmox.com>; Fri, 9 May 2025 14:27:26 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 7048E3CE7B;
Fri, 9 May 2025 14:27:45 +0200 (CEST)
Date: Fri, 09 May 2025 14:27:39 +0200
From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= <f.gruenbichler@proxmox.com>
To: Proxmox Backup Server development discussion <pbs-devel@lists.proxmox.com>
References: <20250508130555.494782-1-c.ebner@proxmox.com>
<20250508130555.494782-8-c.ebner@proxmox.com>
In-Reply-To: <20250508130555.494782-8-c.ebner@proxmox.com>
MIME-Version: 1.0
User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid)
Message-Id: <1746790767.6u1tbrjgn7.astroid@yuna.none>
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.046 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
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
Subject: Re: [pbs-devel] [RFC v2 proxmox-backup 07/21] sync: ignore trashed
groups in local source reader
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>
On May 8, 2025 3:05 pm, Christian Ebner wrote:
> Check and exclude backup groups which have been marked as trash from
> sync.
could be grouped with patch 5?
>
> Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
> ---
> pbs-datastore/src/backup_info.rs | 7 +++++++
> src/server/sync.rs | 1 +
> 2 files changed, 8 insertions(+)
>
> diff --git a/pbs-datastore/src/backup_info.rs b/pbs-datastore/src/backup_info.rs
> index 189ed28ad..b4fabb2cc 100644
> --- a/pbs-datastore/src/backup_info.rs
> +++ b/pbs-datastore/src/backup_info.rs
> @@ -105,6 +105,13 @@ impl BackupGroup {
> self.full_group_path().exists()
> }
>
> + /// Check if the group is currently marked as trash by checking the presence of the trash
> + /// marker file in the group's directory
> + pub fn is_trashed(&self) -> bool {
> + let path = self.full_group_path().join(TRASH_MARKER_FILENAME);
> + path.exists()
> + }
and this hunk moved to patch 2, or the is_trashed helpers extracted into
their own patch?
> +
> pub fn list_backups(&self, filter: ListBackupFilter) -> Result<Vec<BackupInfo>, Error> {
> let mut list = vec![];
>
> diff --git a/src/server/sync.rs b/src/server/sync.rs
> index 3de2ec9a4..ce338fbbe 100644
> --- a/src/server/sync.rs
> +++ b/src/server/sync.rs
> @@ -447,6 +447,7 @@ impl SyncSource for LocalSource {
> Some(owner),
> )?
> .filter_map(Result::ok)
> + .filter(|backup_group| !backup_group.is_trashed())
> .map(|backup_group| backup_group.group().clone())
> .collect::<Vec<pbs_api_types::BackupGroup>>())
> }
> --
> 2.39.5
>
>
>
> _______________________________________________
> 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