[pbs-devel] [PATCH v2 proxmox-backup 10/31] server: sync: move skip info/reason to common sync module
Christian Ebner
c.ebner at proxmox.com
Thu Aug 1 09:43:42 CEST 2024
Make `SkipReason` and `SkipInfo` accessible for sync operations of
both direction variants, push and pull.
Signed-off-by: Christian Ebner <c.ebner at proxmox.com>
---
changes since version 1:
- no changes
src/server/pull.rs | 82 ++--------------------------------------------
src/server/sync.rs | 79 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 81 insertions(+), 80 deletions(-)
diff --git a/src/server/pull.rs b/src/server/pull.rs
index c6932dcc5..d18c6d643 100644
--- a/src/server/pull.rs
+++ b/src/server/pull.rs
@@ -28,7 +28,8 @@ use pbs_datastore::{check_backup_owner, DataStore, StoreProgress};
use pbs_tools::sha::sha256;
use super::sync::{
- LocalSource, RemoteSource, RemovedVanishedStats, SyncSource, SyncSourceReader, SyncStats,
+ LocalSource, RemoteSource, RemovedVanishedStats, SkipInfo, SkipReason, SyncSource,
+ SyncSourceReader, SyncStats,
};
use crate::backup::{check_ns_modification_privs, check_ns_privs};
use crate::tools::parallel_handler::ParallelHandler;
@@ -474,85 +475,6 @@ async fn pull_snapshot_from<'a>(
Ok(sync_stats)
}
-#[derive(PartialEq, Eq)]
-enum SkipReason {
- AlreadySynced,
- TransferLast,
-}
-
-impl std::fmt::Display for SkipReason {
- fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
- write!(
- f,
- "{}",
- match self {
- SkipReason::AlreadySynced => "older than the newest local snapshot",
- SkipReason::TransferLast => "due to transfer-last",
- }
- )
- }
-}
-
-struct SkipInfo {
- oldest: i64,
- newest: i64,
- count: u64,
- skip_reason: SkipReason,
-}
-
-impl SkipInfo {
- fn new(skip_reason: SkipReason) -> Self {
- SkipInfo {
- oldest: i64::MAX,
- newest: i64::MIN,
- count: 0,
- skip_reason,
- }
- }
-
- fn reset(&mut self) {
- self.count = 0;
- self.oldest = i64::MAX;
- self.newest = i64::MIN;
- }
-
- 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;
- }
- }
-
- fn affected(&self) -> Result<String, Error> {
- match self.count {
- 0 => Ok(String::new()),
- 1 => Ok(proxmox_time::epoch_to_rfc3339_utc(self.oldest)?),
- _ => Ok(format!(
- "{} .. {}",
- proxmox_time::epoch_to_rfc3339_utc(self.oldest)?,
- proxmox_time::epoch_to_rfc3339_utc(self.newest)?,
- )),
- }
- }
-}
-
-impl std::fmt::Display for SkipInfo {
- fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
- write!(
- f,
- "skipped: {} snapshot(s) ({}) - {}",
- self.count,
- self.affected().map_err(|_| std::fmt::Error)?,
- self.skip_reason,
- )
- }
-}
-
/// Pulls a group according to `params`.
///
/// Pulling a group consists of the following steps:
diff --git a/src/server/sync.rs b/src/server/sync.rs
index f8a1e133d..ffc32f45f 100644
--- a/src/server/sync.rs
+++ b/src/server/sync.rs
@@ -467,3 +467,82 @@ impl SyncSource for LocalSource {
}))
}
}
+
+#[derive(PartialEq, Eq)]
+pub(crate) enum SkipReason {
+ AlreadySynced,
+ TransferLast,
+}
+
+impl std::fmt::Display for SkipReason {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ write!(
+ f,
+ "{}",
+ match self {
+ SkipReason::AlreadySynced => "older than the newest local snapshot",
+ SkipReason::TransferLast => "due to transfer-last",
+ }
+ )
+ }
+}
+
+pub(crate) struct SkipInfo {
+ oldest: i64,
+ newest: i64,
+ pub(crate) count: u64,
+ skip_reason: SkipReason,
+}
+
+impl SkipInfo {
+ pub(crate) fn new(skip_reason: SkipReason) -> Self {
+ SkipInfo {
+ oldest: i64::MAX,
+ newest: i64::MIN,
+ count: 0,
+ skip_reason,
+ }
+ }
+
+ pub(crate) fn reset(&mut self) {
+ self.count = 0;
+ self.oldest = i64::MAX;
+ self.newest = i64::MIN;
+ }
+
+ pub(crate) 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;
+ }
+ }
+
+ fn affected(&self) -> Result<String, Error> {
+ match self.count {
+ 0 => Ok(String::new()),
+ 1 => Ok(proxmox_time::epoch_to_rfc3339_utc(self.oldest)?),
+ _ => Ok(format!(
+ "{} .. {}",
+ proxmox_time::epoch_to_rfc3339_utc(self.oldest)?,
+ proxmox_time::epoch_to_rfc3339_utc(self.newest)?,
+ )),
+ }
+ }
+}
+
+impl std::fmt::Display for SkipInfo {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ write!(
+ f,
+ "skipped: {} snapshot(s) ({}) - {}",
+ self.count,
+ self.affected().map_err(|_| std::fmt::Error)?,
+ self.skip_reason,
+ )
+ }
+}
--
2.39.2
More information about the pbs-devel
mailing list