From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH guest-common 2/2] ReplicationState: deterministically order replication jobs
Date: Tue, 24 May 2022 13:41:16 +0200 [thread overview]
Message-ID: <20220524114116.2543812-2-d.csapak@proxmox.com> (raw)
In-Reply-To: <20220524114116.2543812-1-d.csapak@proxmox.com>
if we have multiple jobs for the same vmid with the same schedule,
the last_sync, next_sync and vmid will always be the same, so the order
depends on the order of the $jobs hash (which is random; thanks perl)
to have a fixed order, take the jobid also into consideration
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/PVE/ReplicationState.pm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/PVE/ReplicationState.pm b/src/PVE/ReplicationState.pm
index 8eebb42..ae6b1fb 100644
--- a/src/PVE/ReplicationState.pm
+++ b/src/PVE/ReplicationState.pm
@@ -322,7 +322,9 @@ sub get_next_job {
return $res if $res != 0;
$res = $joba->{next_sync} <=> $jobb->{next_sync};
return $res if $res != 0;
- return $joba->{guest} <=> $jobb->{guest};
+ $res = $joba->{guest} <=> $jobb->{guest};
+ return $res if $res != 0;
+ return $a cmp $b;
};
foreach my $jobid (sort $sort_func keys %$jobs) {
--
2.30.2
next prev parent reply other threads:[~2022-05-24 11:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-24 11:41 [pve-devel] [RFC PATCH guest-common 1/2] ReplicationState: purge state from non local vms Dominik Csapak
2022-05-24 11:41 ` Dominik Csapak [this message]
2022-05-25 14:30 ` [pve-devel] [PATCH guest-common 2/2] ReplicationState: deterministically order replication jobs Thomas Lamprecht
2022-05-27 6:23 ` Dominik Csapak
2022-05-27 7:22 ` Thomas Lamprecht
2022-05-24 11:43 ` [pve-devel] [RFC PATCH guest-common 1/2] ReplicationState: purge state from non local vms Dominik Csapak
[not found] ` <1654180326.vcply64b2j.astroid@nora.none>
2022-06-03 6:45 ` Thomas Lamprecht
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=20220524114116.2543812-2-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pve-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