From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [PATCH proxmox-backup] sync: pull: use LogLineSender also for `load_file_into`
Date: Mon, 27 Apr 2026 09:55:02 +0200 [thread overview]
Message-ID: <20260427075509.776694-1-d.csapak@proxmox.com> (raw)
there was still a single log message there with a regular 'info!' macro
that didn't use the LogLineSender.
Fix that by requiring the LogLineSender there too.
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/server/pull.rs | 8 ++++++--
src/server/sync.rs | 42 +++++++++++++++++++++++++++++++++---------
2 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/src/server/pull.rs b/src/server/pull.rs
index 42c34732f..161b6fcb3 100644
--- a/src/server/pull.rs
+++ b/src/server/pull.rs
@@ -448,7 +448,7 @@ async fn pull_single_archive<'a>(
.await?;
reader
- .load_file_into(archive_name, &tmp_path)
+ .load_file_into(archive_name, &tmp_path, Arc::clone(&log_sender))
.await
.with_context(|| archive_prefix.clone())?;
@@ -654,7 +654,11 @@ async fn pull_snapshot<'a>(
let mut tmp_manifest_name = manifest_name.clone();
tmp_manifest_name.set_extension("tmp");
let Some(tmp_manifest_blob) = reader
- .load_file_into(MANIFEST_BLOB_NAME.as_ref(), &tmp_manifest_name)
+ .load_file_into(
+ MANIFEST_BLOB_NAME.as_ref(),
+ &tmp_manifest_name,
+ Arc::clone(&log_sender),
+ )
.await
.with_context(|| prefix.clone())?
else {
diff --git a/src/server/sync.rs b/src/server/sync.rs
index 92449ff98..2f84abb24 100644
--- a/src/server/sync.rs
+++ b/src/server/sync.rs
@@ -106,7 +106,12 @@ pub(crate) trait SyncSourceReader: Send + Sync {
/// Asynchronously loads a file from the source into a local file.
/// `filename` is the name of the file to load from the source.
/// `into` is the path of the local file to load the source file into.
- async fn load_file_into(&self, filename: &str, into: &Path) -> Result<Option<DataBlob>, Error>;
+ async fn load_file_into(
+ &self,
+ filename: &str,
+ into: &Path,
+ log_sender: Arc<LogLineSender>,
+ ) -> Result<Option<DataBlob>, Error>;
/// Tries to fetch the client log from the source and save it into a local file.
async fn try_fetch_client_log(
@@ -146,7 +151,12 @@ impl SyncSourceReader for RemoteSourceReader {
Ok(Arc::new(chunk_reader))
}
- async fn load_file_into(&self, filename: &str, into: &Path) -> Result<Option<DataBlob>, Error> {
+ async fn load_file_into(
+ &self,
+ filename: &str,
+ into: &Path,
+ log_sender: Arc<LogLineSender>,
+ ) -> Result<Option<DataBlob>, Error> {
let mut tmp_file = std::fs::OpenOptions::new()
.write(true)
.create(true)
@@ -158,10 +168,15 @@ impl SyncSourceReader for RemoteSourceReader {
match err.downcast_ref::<HttpError>() {
Some(HttpError { code, message }) => match *code {
StatusCode::NOT_FOUND => {
- info!(
- "Snapshot {}: skipped because vanished since start of sync",
- &self.dir
- );
+ log_sender
+ .log(
+ Level::INFO,
+ format!(
+ "Snapshot {}: skipped because vanished since start of sync",
+ &self.dir
+ ),
+ )
+ .await?;
return Ok(None);
}
_ => {
@@ -245,7 +260,12 @@ impl SyncSourceReader for LocalSourceReader {
Ok(Arc::new(chunk_reader))
}
- async fn load_file_into(&self, filename: &str, into: &Path) -> Result<Option<DataBlob>, Error> {
+ async fn load_file_into(
+ &self,
+ filename: &str,
+ into: &Path,
+ _log_sender: Arc<LogLineSender>,
+ ) -> Result<Option<DataBlob>, Error> {
let mut tmp_file = std::fs::OpenOptions::new()
.write(true)
.create(true)
@@ -281,8 +301,12 @@ impl SyncSourceReader for LocalSourceReader {
)
.await?;
} else {
- self.load_file_into(CLIENT_LOG_BLOB_NAME.as_ref(), to_path)
- .await?;
+ self.load_file_into(
+ CLIENT_LOG_BLOB_NAME.as_ref(),
+ to_path,
+ Arc::clone(&log_sender),
+ )
+ .await?;
}
log_sender
.log(
--
2.47.3
next reply other threads:[~2026-04-27 7:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-27 7:55 Dominik Csapak [this message]
2026-04-27 8:19 ` [PATCH proxmox-backup] sync: pull: use LogLineSender also for `load_file_into` Fabian Grünbichler
2026-04-27 8:50 ` Fabian Grünbichler
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=20260427075509.776694-1-d.csapak@proxmox.com \
--to=d.csapak@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox