From: Christian Ebner <c.ebner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 2/3] sync: pull: do not resync currently newest snapshot on target
Date: Mon, 4 Nov 2024 11:58:29 +0100 [thread overview]
Message-ID: <20241104105830.85612-2-c.ebner@proxmox.com> (raw)
In-Reply-To: <20241104105830.85612-1-c.ebner@proxmox.com>
The currently newest snapshot of a group on the sync target is not
excluded from the list of already synced snapshots, leading to a
re-sync.
Filter out the snapshot as well.
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
Might be ignored if the re-sync is intetional.
Implementation already present since commit:
de8ec041 ("src/api2/sync.rs: implement remote sync")
src/server/pull.rs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/server/pull.rs b/src/server/pull.rs
index cc1427196..7aa191d96 100644
--- a/src/server/pull.rs
+++ b/src/server/pull.rs
@@ -528,7 +528,7 @@ async fn pull_group(
.enumerate()
.filter(|&(pos, ref dir)| {
source_snapshots.insert(dir.time);
- if last_sync_time > dir.time {
+ if last_sync_time >= dir.time {
already_synced_skip_info.update(dir.time);
return false;
} else if already_synced_skip_info.count > 0 {
@@ -536,7 +536,7 @@ async fn pull_group(
already_synced_skip_info.reset();
}
- if pos < cutoff && last_sync_time != dir.time {
+ if pos < cutoff {
transfer_last_skip_info.update(dir.time);
return false;
} else if transfer_last_skip_info.count > 0 {
--
2.39.5
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
next prev parent reply other threads:[~2024-11-04 10:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-04 10:58 [pbs-devel] [PATCH proxmox-backup 1/3] sync: fix premature return in snapshot skip filter logic Christian Ebner
2024-11-04 10:58 ` Christian Ebner [this message]
2024-11-04 12:15 ` [pbs-devel] [PATCH proxmox-backup 2/3] sync: pull: do not resync currently newest snapshot on target Fabian Grünbichler
2024-11-04 12:20 ` Christian Ebner
2024-11-04 10:58 ` [pbs-devel] [PATCH proxmox-backup 3/3] sync: pull: simplify logic for source snapshot filtering Christian Ebner
2024-11-04 12:15 ` Fabian Grünbichler
2024-11-04 12:15 ` [pbs-devel] partially-applied: [PATCH proxmox-backup 1/3] sync: fix premature return in snapshot skip filter logic Fabian Grünbichler
2024-11-04 12:57 ` Christian Ebner
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=20241104105830.85612-2-c.ebner@proxmox.com \
--to=c.ebner@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