From: Jakob Klocker <j.klocker@proxmox.com>
To: pbs-devel@lists.proxmox.com
Cc: Jakob Klocker <j.klocker@proxmox.com>
Subject: [PATCH proxmox-backup v2 1/3] server: pull: run blocking file operations on the blocking pool
Date: Fri, 21 Aug 2026 13:18:24 +0200 [thread overview]
Message-ID: <20260821111826.299588-2-j.klocker@proxmox.com> (raw)
In-Reply-To: <20260821111826.299588-1-j.klocker@proxmox.com>
The atomic renames and the unreferenced-file cleanup are blocking
operations that ran directly on the runtime's worker threads, stalling
other tasks scheduled there for their duration.
Use the tokio counterpart for the renames and move the cleanup onto the
blocking thread pool.
Signed-off-by: Jakob Klocker <j.klocker@proxmox.com>
---
src/server/pull.rs | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/server/pull.rs b/src/server/pull.rs
index 4eb5bcf11..fd401ac85 100644
--- a/src/server/pull.rs
+++ b/src/server/pull.rs
@@ -600,7 +600,7 @@ async fn pull_single_archive<'a>(
} else {
tmp_path
};
- if let Err(err) = std::fs::rename(&source_path, &path) {
+ if let Err(err) = tokio::fs::rename(&source_path, &path).await {
bail!("{archive_prefix}: Atomic rename file {path:?} failed - {err}");
}
@@ -890,7 +890,7 @@ async fn pull_snapshot<'a>(
nix::unistd::fsync(tmp_manifest_file.as_raw_fd())?;
}
- if let Err(err) = std::fs::rename(&tmp_manifest_name, &manifest_name) {
+ if let Err(err) = tokio::fs::rename(&tmp_manifest_name, &manifest_name).await {
bail!("{prefix}: Atomic rename file {manifest_name:?} failed - {err}");
}
if let DatastoreBackend::S3(s3_client) = backend {
@@ -910,8 +910,9 @@ async fn pull_snapshot<'a>(
fetch_log(crypt_config).await?;
- snapshot
- .cleanup_unreferenced_files(&manifest)
+ let snapshot = snapshot.clone();
+ tokio::task::spawn_blocking(move || snapshot.cleanup_unreferenced_files(&manifest))
+ .await?
.map_err(|err| format_err!("{prefix}: failed to cleanup unreferenced files - {err}"))?;
Ok(Some(sync_stats))
--
2.47.3
next prev parent reply other threads:[~2026-08-21 11:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-21 11:18 [PATCH proxmox-backup v2 0/3] fix #6990: server: drop verify state on push & pull job Jakob Klocker
2026-08-21 11:18 ` Jakob Klocker [this message]
2026-08-21 11:18 ` [PATCH proxmox-backup v2 2/3] fix #6990: server: drop verify state on push job Jakob Klocker
2026-08-21 11:18 ` [PATCH proxmox-backup v2 3/3] fix #6990: server: drop verify state on non-decrypt pull job Jakob Klocker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260821111826.299588-2-j.klocker@proxmox.com \
--to=j.klocker@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.