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 6D12F1FF164
for <inbox@lore.proxmox.com>; Fri, 9 May 2025 14:27:47 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 9E0F33D194;
Fri, 9 May 2025 14:28:06 +0200 (CEST)
Date: Fri, 09 May 2025 14:27:30 +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-14-c.ebner@proxmox.com>
In-Reply-To: <20250508130555.494782-14-c.ebner@proxmox.com>
MIME-Version: 1.0
User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid)
Message-Id: <1746792270.885af032mi.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 13/21] datastore: recreate
trashed backup groups if requested
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:
> A whole backup group might have been marked as trashed, including all
> of the contained snapshots.
>
> Since a new backup to that group (even as different user/owner)
> should still work, permanently clear the whole trashed group before
> recreation. This will limit the trash lifetime as now the group is
> not recoverable until next garbage collection.
IMHO this is phrased in a way that makes it hard to parse, and in any
case, such things should go into the docs..
>
> Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
> ---
> pbs-datastore/src/datastore.rs | 26 ++++++++++++++++++++++++++
> 1 file changed, 26 insertions(+)
>
> diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs
> index 4f7766c36..ca05e1bea 100644
> --- a/pbs-datastore/src/datastore.rs
> +++ b/pbs-datastore/src/datastore.rs
> @@ -934,6 +934,32 @@ impl DataStore {
> let guard = backup_group.lock().with_context(|| {
> format!("while creating locked backup group '{backup_group:?}'")
> })?;
> + if backup_group.is_trashed() {
> + info!("clear trashed backup group {full_path:?}");
I think we should only do this if the new and old owner are not
identical..
> + let dir_entries = std::fs::read_dir(&full_path).context(
> + "failed to read directory contents during cleanup of trashed group",
> + )?;
> + for entry in dir_entries {
> + let entry = entry.context(
> + "failed to read directory entry during clenup of trashed group",
> + )?;
> + let file_type = entry.file_type().context(
> + "failed to get entry file type during clenup of trashed group",
> + )?;
> + if file_type.is_dir() {
> + std::fs::remove_dir_all(entry.path())
> + .context("failed to remove directory entry during clenup of trashed snapshot")?;
> + } else {
> + std::fs::remove_file(entry.path())
> + .context("failed to remove directory entry during clenup of trashed snapshot")?;
> + }
> + }
> + self.set_owner(ns, backup_group.group(), auth_id, false)?;
> + let owner = self.get_owner(ns, backup_group.group())?; // just to be sure
sure about that? we are holding a lock here, nobody is allowed to change
the owner but us..
> + self.untrash_namespace(ns)?;
> + return Ok((owner, guard));
> + }
> +
> let owner = self.get_owner(ns, backup_group.group())?; // just to be sure
> Ok((owner, guard))
> }
> --
> 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