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 7E9BE1FF164
for <inbox@lore.proxmox.com>; Fri, 9 May 2025 14:27:53 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id B15A63D1D6;
Fri, 9 May 2025 14:28:12 +0200 (CEST)
Date: Fri, 09 May 2025 14:27:36 +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-13-c.ebner@proxmox.com>
In-Reply-To: <20250508130555.494782-13-c.ebner@proxmox.com>
MIME-Version: 1.0
User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid)
Message-Id: <1746791755.kc17x5cte7.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 12/21] datastore: clear
trashed snapshot dir if re-creation 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:
> If a previously trashed snapshot has been requested for re-creation
> (e.g. by a sync job in push direction), drop the contents of the
> currently trashed snapshot.
> The snapshot directory itself is already locked at that point, either
> by the old locking mechanism acting on the directory itself or by the
> new locking mechanism. Therefore, concurrent operations can be
> excluded.
>
> For the call site this acts as if the snapshot directory has been
> newly created.
>
> Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
> ---
> pbs-datastore/src/datastore.rs | 29 ++++++++++++++++++++++++++++-
> 1 file changed, 28 insertions(+), 1 deletion(-)
>
> diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs
> index ffc6a7039..4f7766c36 100644
> --- a/pbs-datastore/src/datastore.rs
> +++ b/pbs-datastore/src/datastore.rs
> @@ -951,8 +951,9 @@ impl DataStore {
> ) -> Result<(PathBuf, bool, BackupLockGuard), Error> {
> let backup_dir = self.backup_dir(ns.clone(), backup_dir.clone())?;
> let relative_path = backup_dir.relative_path();
> + let full_path = backup_dir.full_path();
>
> - match std::fs::create_dir(backup_dir.full_path()) {
> + match std::fs::create_dir(&full_path) {
> Ok(_) => {
> let guard = backup_dir.lock().with_context(|| {
> format!("while creating new locked snapshot '{backup_dir:?}'")
> @@ -963,6 +964,32 @@ impl DataStore {
> let guard = backup_dir
> .lock()
> .with_context(|| format!("while creating locked snapshot '{backup_dir:?}'"))?;
> +
> + if backup_dir.is_trashed() {
> + info!("clear trashed backup snapshot {full_path:?}");
> + let dir_entries = std::fs::read_dir(&full_path).context(
> + "failed to read directory contents during cleanup of trashed snapshot",
> + )?;
> + for entry in dir_entries {
> + let entry = entry.context(
> + "failed to read directory entry during clenup of trashed snapshot",
> + )?;
> + // Only expect regular file entries
> + std::fs::remove_file(entry.path()).context(
> + "failed to remove directory entry during clenup of trashed snapshot",
> + )?;
> + }
> + let group = BackupGroup::from(backup_dir);
> + let group_trash_file = group.full_group_path().join(TRASH_MARKER_FILENAME);
> + if let Err(err) = std::fs::remove_file(&group_trash_file) {
> + if err.kind() != std::io::ErrorKind::NotFound {
> + bail!("failed to remove group trash file of trashed snapshot");
> + }
> + }
this shouldn't be possible to hit, right? as creating a backup dir
entails first creating the backup group (guarded by the group lock), and
that would already clear the group's trash marker..
> + self.untrash_namespace(ns)?;
> + return Ok((relative_path, true, guard));
> + }
> +
> Ok((relative_path, false, guard))
> }
> Err(e) => Err(e.into()),
> --
> 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