From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 8292072BD1 for ; Tue, 24 May 2022 13:41:17 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 786BF1EBD5 for ; Tue, 24 May 2022 13:41:17 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 09DEB1EBCC for ; Tue, 24 May 2022 13:41:17 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id CFCD143838 for ; Tue, 24 May 2022 13:41:16 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Tue, 24 May 2022 13:41:16 +0200 Message-Id: <20220524114116.2543812-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220524114116.2543812-1-d.csapak@proxmox.com> References: <20220524114116.2543812-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.116 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [replicationstate.pm] Subject: [pve-devel] [PATCH guest-common 2/2] ReplicationState: deterministically order replication jobs X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 May 2022 11:41:17 -0000 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 --- 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