From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup v2] client/pull: log snapshots that are skipped because of time
Date: Fri, 4 Jun 2021 12:43:50 +0200 [thread overview]
Message-ID: <20210604104350.6372-1-d.csapak@proxmox.com> (raw)
we skip snapshots that are older than the newest snapshot of the group in
the target datastore, log it so the user can know why it is not synced
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
changes from v1:
* only log 1 line per backup group by implementing a 'SkipInfo' struct
that counts, saves the corresponding backup_times to log, and
implements 'Display' to log
src/client/pull.rs | 61 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 61 insertions(+)
diff --git a/src/client/pull.rs b/src/client/pull.rs
index 95720973..a52f4e02 100644
--- a/src/client/pull.rs
+++ b/src/client/pull.rs
@@ -14,6 +14,7 @@ use crate::{
backup::*,
client::*,
server::WorkerTask,
+ task_log,
tools::{compute_file_csum, ParallelHandler},
};
use proxmox::api::error::{HttpError, StatusCode};
@@ -443,6 +444,51 @@ pub async fn pull_snapshot_from(
Ok(())
}
+struct SkipInfo {
+ oldest: i64,
+ newest: i64,
+ count: u64,
+}
+
+impl SkipInfo {
+ fn update(&mut self, backup_time: i64) {
+ self.count += 1;
+
+ if backup_time < self.oldest {
+ self.oldest = backup_time;
+ }
+
+ if backup_time > self.newest {
+ self.newest = backup_time;
+ }
+ }
+}
+
+impl std::fmt::Display for SkipInfo {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ if self.count > 1 {
+ write!(
+ f,
+ "{} snapshots ({}..{}) that are older than the newest local snapshot",
+ self.count,
+ proxmox::tools::time::epoch_to_rfc3339_utc(self.oldest)
+ .map_err(|_| std::fmt::Error)?,
+ proxmox::tools::time::epoch_to_rfc3339_utc(self.newest)
+ .map_err(|_| std::fmt::Error)?,
+ )
+ } else if self.count == 1 {
+ write!(
+ f,
+ "1 snapshot ({}) that is older than the newest local snapshot",
+ proxmox::tools::time::epoch_to_rfc3339_utc(self.oldest)
+ .map_err(|_| std::fmt::Error)?,
+ )
+ } else {
+ write!(f, "0 snapshots")
+ }
+ }
+}
+
pub async fn pull_group(
worker: &WorkerTask,
client: &HttpClient,
@@ -477,6 +523,12 @@ pub async fn pull_group(
progress.group_snapshots = list.len() as u64;
+ let mut skip_info = SkipInfo {
+ oldest: i64::MAX,
+ newest: i64::MIN,
+ count: 0,
+ };
+
for (pos, item) in list.into_iter().enumerate() {
let snapshot = BackupDir::new(item.backup_type, item.backup_id, item.backup_time)?;
@@ -495,6 +547,7 @@ pub async fn pull_group(
if let Some(last_sync_time) = last_sync {
if last_sync_time > backup_time {
+ skip_info.update(backup_time);
continue;
}
}
@@ -552,6 +605,14 @@ pub async fn pull_group(
}
}
+ if skip_info.count > 0 {
+ task_log!(
+ worker,
+ "skipped: {}",
+ skip_info,
+ );
+ }
+
Ok(())
}
--
2.20.1
next reply other threads:[~2021-06-04 10:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-04 10:43 Dominik Csapak [this message]
2021-06-04 13:54 Dietmar Maurer
2021-06-04 14:03 ` Dominik Csapak
2021-06-07 8:30 Dominik Csapak
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=20210604104350.6372-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 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.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal