[pbs-devel] [PATCH proxmox-backup 3/3] sync: pull: simplify logic for source snapshot filtering
Christian Ebner
c.ebner at proxmox.com
Mon Nov 4 11:58:30 CET 2024
Decouple the actual filter logic from the skip reason output logic by
pulling the latter out of the filter closue.
Makes the filtering logic more intuitive.
Signed-off-by: Christian Ebner <c.ebner at proxmox.com>
---
src/server/pull.rs | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/server/pull.rs b/src/server/pull.rs
index 7aa191d96..8f00ae0af 100644
--- a/src/server/pull.rs
+++ b/src/server/pull.rs
@@ -531,23 +531,25 @@ async fn pull_group(
if last_sync_time >= dir.time {
already_synced_skip_info.update(dir.time);
return false;
- } else if already_synced_skip_info.count > 0 {
- info!("{already_synced_skip_info}");
- already_synced_skip_info.reset();
}
-
if pos < cutoff {
transfer_last_skip_info.update(dir.time);
return false;
- } else if transfer_last_skip_info.count > 0 {
- info!("{transfer_last_skip_info}");
- transfer_last_skip_info.reset();
}
true
})
.map(|(_, dir)| dir)
.collect();
+ if already_synced_skip_info.count > 0 {
+ info!("{already_synced_skip_info}");
+ already_synced_skip_info.reset();
+ }
+ if transfer_last_skip_info.count > 0 {
+ info!("{transfer_last_skip_info}");
+ transfer_last_skip_info.reset();
+ }
+
// start with 65536 chunks (up to 256 GiB)
let downloaded_chunks = Arc::new(Mutex::new(HashSet::with_capacity(1024 * 64)));
--
2.39.5
More information about the pbs-devel
mailing list